Merge lp://staging/~barry/ubuntu-system-image/lp1374459 into lp://staging/~registry/ubuntu-system-image/client
Proposed by
Barry Warsaw
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 291 | ||||
| Proposed branch: | lp://staging/~barry/ubuntu-system-image/lp1374459 | ||||
| Merge into: | lp://staging/~registry/ubuntu-system-image/client | ||||
| Diff against target: |
4171 lines (+1961/-625) (has conflicts) 36 files modified
.bzrignore (+2/-1) MANIFEST.in (+1/-1) NEWS.rst (+31/-7) cli-manpage.rst (+13/-0) coverage.ini (+2/-0) systemimage/config.py (+15/-0) systemimage/curl.py (+273/-0) systemimage/dbus.py (+19/-19) systemimage/download.py (+131/-31) systemimage/helpers.py (+11/-18) systemimage/index.py (+1/-4) systemimage/main.py (+12/-1) systemimage/scores.py (+29/-13) systemimage/service.py (+5/-2) systemimage/state.py (+11/-1) systemimage/testing/controller.py (+37/-11) systemimage/testing/dbus.py (+7/-1) systemimage/testing/helpers.py (+30/-8) systemimage/testing/service.py (+15/-0) systemimage/tests/data/index_22.json (+2/-3) systemimage/tests/data/index_26.json (+245/-0) systemimage/tests/test_api.py (+0/-66) systemimage/tests/test_candidates.py (+16/-24) systemimage/tests/test_config.py (+35/-0) systemimage/tests/test_dbus.py (+67/-17) systemimage/tests/test_download.py (+226/-61) systemimage/tests/test_helpers.py (+51/-43) systemimage/tests/test_index.py (+0/-42) systemimage/tests/test_main.py (+209/-195) systemimage/tests/test_scores.py (+83/-10) systemimage/tests/test_state.py (+130/-36) systemimage/tests/test_winner.py (+1/-1) systemimage/udm.py (+213/-0) systemimage/version.txt (+4/-0) tools/runme.sh (+10/-0) tox.ini (+24/-9) Text conflict in NEWS.rst Text conflict in cli-manpage.rst Text conflict in systemimage/download.py Text conflict in systemimage/state.py Text conflict in systemimage/testing/helpers.py Text conflict in systemimage/tests/test_dbus.py Text conflict in systemimage/tests/test_download.py Text conflict in systemimage/version.txt Text conflict in tox.ini |
||||
| To merge this branch: | bzr merge lp://staging/~barry/ubuntu-system-image/lp1374459 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Hunt | Pending | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Description of the change
This is still a work in progress, but it's encouraging. There are still a number of test failures and skips, but these are all traceable to the fact that the PyCURL loop is not yet integrated with the D-Bus main loop. This means that all tests which require dispatch into D-Bus methods while the download is progressing are blocked, i.e. cancel, pause, resume.
Also, some of the tests mock DBusDownloadManager methods, so those have to be rewritten too.
Still, there's a lot to like about this branch, so I'm putting up an MP for comments.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
