lp://staging/~tribaal/landscape-client/take-two-1434546-exit-code-2-on-error

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~landscape/landscape-client/trunk at revision 815

Alberto Donato: Approve on 2015-03-25

Benji York (community): Approve on 2015-03-25

Diff: 183 lines (+67/-11)

2 files modified

landscape/configuration.py (+13/-2)
landscape/tests/test_configuration.py (+54/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1434546: Client does not return the correct exit code when failing to communicate with server.

Medium

Fix Released

Link a bug report

Related blueprints

818. By Chris Glass on 2015-03-25

Added assertion of success as requested.

817. By Chris Glass on 2015-03-25

Peppin'

816. By Chris Glass on 2015-03-25

PEP8

815. By Chris Glass on 2015-03-25

A saner approach to determining exit codes on the client, as suggested by Benji.

814. By Chris Glass on 2015-03-20

Merge fix-1429888-wrong-credentials-stacktrace [f=1429888] [r=bjornt,adam-collard] [a=Chris Glass]
This branch fixes the related bug, where inappropriate account/password combinations made client registration badly.

813. By Benji York on 2015-03-10

Merge bug-1428826-restore-register-function-public-API [f=1428826] [r=adam-collard,bjornt] [a=Benji York]
Instead of running client configuration as an independent executable
(which would have been preferable), the client charm reaches inside and
calls the register() function directly. That has resulted in a
dependency on register()'s API which was not enforced via testing or
documented in register()'s docstring.

This branch restores the API the charm depends on, adds documentation as
to its meaning and importance, and adds tests that will warn us if the
API is broken in the future.

812. By Benji York on 2015-03-04

Merge better-self-signed-cert-ux-3 [f=] [r=bjornt,danilo] [a=Benji York]
This branch is a pure refactoring of the way the client configuration
communicates so as to separate the UI and network code in preparation
for better SSL error handling and user interaction.

Tests were then able to be improved -- but not as far as we would like.

Notes from Chris:

Most of the code breaks out nested function declaration to make them
easier to test, using functools.partial to keep the invocation sane in a
twisted context (test them "flat", use functools to pass closures to
event handlers).

We used manual stubs instead of mocks for readability and personal
preference [of both of us].

811. By Benji York on 2015-03-03

Merge faster-test-run [f=] [r=bjornt,free.ekanayaka,chad.smith] [a=Benji York]
A couple of tests inject dpkg failures which are retried 12 times with a 5 second sleep between. For test that's unneccesary, so this branch sets the sleep time to zero for those tests.

810. By Adam Collard on 2015-01-22

Don't use Python 2.7isms in the test suite (needs to run on Lucid) [trivial] [r=tribaal]

809. By Chris Glass on 2015-01-22

Removed unused instance variable [trivial][r=sparkiegeek]