Merge lp://staging/~michael.nelson/launchpad/567922-fix-ec2-failures-after-db-devel-merge into lp://staging/launchpad/db-devel
Proposed by
Michael Nelson
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Michael Nelson | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 9405 | ||||
| Proposed branch: | lp://staging/~michael.nelson/launchpad/567922-fix-ec2-failures-after-db-devel-merge | ||||
| Merge into: | lp://staging/launchpad/db-devel | ||||
| Prerequisite: | lp://staging/~michael.nelson/launchpad/567922-build-gen-checkpoint | ||||
| Diff against target: |
1064 lines (+168/-141) 20 files modified
lib/lp/buildmaster/configure.zcml (+1/-1) lib/lp/buildmaster/interfaces/packagebuild.py (+1/-1) lib/lp/buildmaster/model/buildbase.py (+8/-7) lib/lp/buildmaster/model/buildfarmjob.py (+1/-1) lib/lp/buildmaster/model/buildfarmjobbehavior.py (+1/-2) lib/lp/buildmaster/model/packagebuild.py (+3/-4) lib/lp/buildmaster/tests/test_buildbase.py (+1/-1) lib/lp/buildmaster/tests/test_buildqueue.py (+22/-12) lib/lp/buildmaster/tests/test_manager.py (+4/-4) lib/lp/soyuz/browser/tests/archive-views.txt (+6/-6) lib/lp/soyuz/doc/build-estimated-dispatch-time.txt (+4/-4) lib/lp/soyuz/doc/buildd-scoring.txt (+4/-2) lib/lp/soyuz/doc/buildd-slavescanner.txt (+62/-62) lib/lp/soyuz/model/binarypackagebuild.py (+16/-11) lib/lp/soyuz/model/binarypackagebuildbehavior.py (+2/-1) lib/lp/soyuz/scripts/buildd.py (+4/-4) lib/lp/soyuz/scripts/packagecopier.py (+4/-4) lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py (+13/-3) lib/lp/soyuz/scripts/tests/test_copypackage.py (+10/-10) lib/lp/soyuz/scripts/tests/test_populatearchive.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/launchpad/567922-fix-ec2-failures-after-db-devel-merge | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Abel Deuring (community) | code | Approve | |
|
Review via email:
|
|||
Description of the change
This branch is part of a pipeline for
https:/
https:/
Overview
========
After getting most of the unit-tests running, I re-merged a fresh db-devel into my pipeline, resolved the conflicts, fixed the obvious errors and sent it off to ec2test. This branch is starts to fix the new failures.
To test
=======
make schema
bin/test -vv -t test_buildfarmjob -t test_buildqueue -t test_manager -t test_buildd_
To post a comment you must log in.
Revision history for this message
| Abel Deuring (adeuring) | # |
review:
Approve
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
