Merge lp://staging/~barry/ubuntu-system-image/lp1373467 into lp://staging/~registry/ubuntu-system-image/client

.bzrignore (+2/-0)
cli-manpage.rst (+13/-14)
dbus-manpage.rst (+14/-14)
ini-manpage.rst (+25/-24)
systemimage/api.py (+0/-5)
systemimage/config.py (+141/-99)
systemimage/data/client.ini (+0/-35)
systemimage/dbus.py (+2/-2)
systemimage/helpers.py (+34/-24)
systemimage/keyring.py (+2/-2)
systemimage/main.py (+5/-13)
systemimage/scores.py (+1/-0)
systemimage/service.py (+5/-11)
systemimage/state.py (+18/-15)
systemimage/testing/controller.py (+7/-6)
systemimage/testing/dbus.py (+1/-0)
systemimage/testing/helpers.py (+109/-52)
systemimage/testing/nose.py (+6/-1)
systemimage/tests/data/00.ini (+0/-1)
systemimage/tests/data/01.ini (+0/-1)
systemimage/tests/data/api.channels_01.json (+13/-0)
systemimage/tests/data/api.index_01.json (+36/-0)
systemimage/tests/data/api.index_02.json (+251/-0)
systemimage/tests/data/candidates.index_01.json (+6/-0)
systemimage/tests/data/candidates.index_02.json (+23/-0)
systemimage/tests/data/candidates.index_08.json (+244/-0)
systemimage/tests/data/candidates.index_10.json (+36/-0)
systemimage/tests/data/candidates.index_11.json (+37/-0)
systemimage/tests/data/candidates.index_13.json (+244/-0)
systemimage/tests/data/channel.channels_01.json (+23/-0)
systemimage/tests/data/channel.channels_02.json (+38/-0)
systemimage/tests/data/channel.channels_03.json (+70/-0)
systemimage/tests/data/channel.channels_04.json (+56/-0)
systemimage/tests/data/channel.channels_05.json (+23/-0)
systemimage/tests/data/channel_06.ini (+0/-8)
systemimage/tests/data/channel_07.ini (+0/-8)
systemimage/tests/data/config.config_01.ini (+34/-0)
systemimage/tests/data/config.config_02.ini (+2/-3)
systemimage/tests/data/config.config_03.ini (+2/-3)
systemimage/tests/data/config.config_04.ini (+36/-0)
systemimage/tests/data/config.config_05.ini (+2/-3)
systemimage/tests/data/config.config_06.ini (+2/-3)
systemimage/tests/data/config.config_07.ini (+0/-1)
systemimage/tests/data/config.config_08.ini (+0/-1)
systemimage/tests/data/config.config_09.ini (+0/-3)
systemimage/tests/data/config.config_10.ini (+2/-2)
systemimage/tests/data/config_04.ini (+0/-36)
systemimage/tests/data/dbus.index_03.json (+36/-0)
systemimage/tests/data/download.index_01.json (+6/-0)
systemimage/tests/data/gpg.channels_01.json (+23/-0)
systemimage/tests/data/helpers.config_01.ini (+7/-0)
systemimage/tests/data/helpers.config_02.ini (+6/-0)
systemimage/tests/data/index.channels_01.json (+9/-0)
systemimage/tests/data/index.channels_02.json (+13/-0)
systemimage/tests/data/index.channels_05.json (+9/-0)
systemimage/tests/data/index.index_01.json (+251/-0)
systemimage/tests/data/index.index_04.json (+244/-0)
systemimage/tests/data/index_26.json (+0/-245)
systemimage/tests/data/main.channels_01.json (+13/-0)
systemimage/tests/data/main.channels_03.json (+13/-0)
systemimage/tests/data/main.config_01.ini (+3/-4)
systemimage/tests/data/main.config_05.ini (+7/-0)
systemimage/tests/data/main.config_07.ini (+1/-1)
systemimage/tests/data/main.index_04.json (+36/-0)
systemimage/tests/data/main.index_05.json (+36/-0)
systemimage/tests/data/scores.index_01.json (+245/-0)
systemimage/tests/data/scores.index_05.json (+245/-0)
systemimage/tests/data/state.channel_01.ini (+6/-0)
systemimage/tests/data/state.channels_01.json (+64/-0)
systemimage/tests/data/state.channels_02.json (+13/-0)
systemimage/tests/data/state.index_01.json (+244/-0)
systemimage/tests/data/state.index_02.json (+245/-0)
systemimage/tests/data/state.index_03.json (+36/-0)
systemimage/tests/data/state.index_04.json (+37/-0)
systemimage/tests/test_api.py (+20/-13)
systemimage/tests/test_candidates.py (+20/-20)
systemimage/tests/test_channel.py (+18/-18)
systemimage/tests/test_config.py (+117/-170)
systemimage/tests/test_dbus.py (+88/-121)
systemimage/tests/test_download.py (+31/-32)
systemimage/tests/test_gpg.py (+12/-12)
systemimage/tests/test_helpers.py (+110/-128)
systemimage/tests/test_index.py (+31/-25)
systemimage/tests/test_main.py (+203/-267)
systemimage/tests/test_scores.py (+10/-10)
systemimage/tests/test_settings.py (+2/-5)
systemimage/tests/test_state.py (+71/-58)
systemimage/tests/test_winner.py (+21/-17)
tools/demo.ini (+0/-1)
tools/mkvenv.py (+0/-1)