Merge lp://staging/~laney/ubuntu-cdimage/test-fixes into lp://staging/ubuntu-cdimage
| Status: | Rejected |
|---|---|
| Rejected by: | Steve Langasek |
| Proposed branch: | lp://staging/~laney/ubuntu-cdimage/test-fixes |
| Merge into: | lp://staging/ubuntu-cdimage |
| Diff against target: |
103 lines (+30/-14) 3 files modified
lib/cdimage/tests/data/result/daily/index.json (+11/-11) lib/cdimage/tests/test_build.py (+5/-3) lib/cdimage/tests/test_simplestreams.py (+14/-0) |
| To merge this branch: | bzr merge lp://staging/~laney/ubuntu-cdimage/test-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
See the top two commits, they should fix the 3 remaining test failures I'm seeing locally.
(1): We need to mock simplestreams generation when running the "full" builder, otherwise we try to generate for real on the system running the test, and it fails.
(2): The comparison is relying on an unstable order - the value of `keys()` in a dict. Let's ensure it's sorted, and also propose the same upstream so we can drop this in time.
Unmerged revisions
- 2093. By Iain Lane
-
test_simplestreams: Sort product list before comparing
Evidently the sort order has changed at some point, and now this test is
failing. Instead of matching the new order, let's sort the lists in-place
before comparing them.If the [upstream proposal]
[upstream- proposal] is accepted, we can drop this
code.[upstream-
proposal] : https:/ /code.launchpad .net/~laney/ simplestreams/ +git/simplestre ams/+merge/ 430411 - 2092. By Iain Lane
-
test_buid: Mock `refresh_
simplestreams( )` This tries to do part of the actual publishing process, mock it out.
Thanks for working on this, unfortunately it only fixes 1 of 6 test failures for me here. Since I'm therefore unable to verify this fix, I am not merging it.
I'm in the process of moving the source code from bzr to git, so regrettably I'm going to ask you to rebase this there (and maybe merge it yourself!)