Merge lp://qastaging/~barry/ubuntu-system-image/testdeps into lp://qastaging/~registry/ubuntu-system-image/client
Proposed by
Barry Warsaw
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~barry/ubuntu-system-image/testdeps |
Merge into: | lp://qastaging/~registry/ubuntu-system-image/client |
Diff against target: |
7673 lines (+7531/-0) (has conflicts) 25 files modified
.bzrignore (+9/-0) README (+24/-0) bin/copy-image (+310/-0) bin/generate-keyrings (+87/-0) bin/generate-keys (+61/-0) bin/import-images (+309/-0) bin/set-phased-percentage (+90/-0) bin/si-shell (+79/-0) etc/config.example (+48/-0) lib/systemimage/config.py (+206/-0) lib/systemimage/diff.py (+245/-0) lib/systemimage/generators.py (+1297/-0) lib/systemimage/gpg.py (+239/-0) lib/systemimage/tools.py (+372/-0) lib/systemimage/tree.py (+1017/-0) tests/generate-keys (+52/-0) tests/run (+60/-0) tests/test_config.py (+281/-0) tests/test_diff.py (+279/-0) tests/test_generators.py (+1135/-0) tests/test_gpg.py (+164/-0) tests/test_static.py (+78/-0) tests/test_tools.py (+303/-0) tests/test_tree.py (+689/-0) utils/check-latest (+97/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. |
To merge this branch: | bzr merge lp://qastaging/~barry/ubuntu-system-image/testdeps |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stéphane Graber | Pending | ||
Review via email: mp+250068@code.qastaging.launchpad.net |
Description of the change
For 100% test coverage, both xz packages must be installed.
To post a comment you must log in.
Unmerged revisions
- 259. By Barry Warsaw
-
Document another test dependency detail.
- 258. By Stéphane Graber
-
Really fix version_detail
- 257. By Stéphane Graber
-
Fix previous commit
- 256. By Stéphane Graber
-
version_detail is supposed to be a string, not a list.
- 255. By Stéphane Graber
-
Add a version_detail field (arbitrary string)
- 254. By Stéphane Graber
-
Make the core images use /writable instead of /userdata
- 253. By Stéphane Graber
-
Add support for azure_amd64
- 252. By Stéphane Graber
-
Let's actually use keyring_name in repack_
recovery_ keyring - 251. By Stéphane Graber
-
Add cdimage_device_raw
- 250. By Stéphane Graber
-
Prevent change_
channel_ alias on a redirect channel