Merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-4 into lp://staging/launchpad/db-devel
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Edwin Grubbs | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 9405 | ||||
| Proposed branch: | lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-4 | ||||
| Merge into: | lp://staging/launchpad/db-devel | ||||
| Prerequisite: | lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-3 | ||||
| Diff against target: |
785 lines (+163/-116) (has conflicts) 21 files modified
lib/lp/archiveuploader/nascentupload.py (+2/-2) lib/lp/archiveuploader/nascentuploadfile.py (+4/-4) lib/lp/buildmaster/browser/configure.zcml (+2/-1) lib/lp/buildmaster/browser/packagebuild.py (+0/-42) lib/lp/buildmaster/interfaces/buildfarmjob.py (+6/-1) lib/lp/buildmaster/model/buildfarmjob.py (+7/-0) lib/lp/buildmaster/tests/test_buildfarmjob.py (+24/-0) lib/lp/soyuz/adapters/archivedependencies.py (+2/-2) lib/lp/soyuz/doc/archive-dependencies.txt (+9/-8) lib/lp/soyuz/doc/archive-files.txt (+1/-1) lib/lp/soyuz/doc/archive.txt (+2/-2) lib/lp/soyuz/doc/build-failedtoupload-workflow.txt (+4/-4) lib/lp/soyuz/model/archive.py (+9/-6) lib/lp/soyuz/model/binarypackagebuild.py (+33/-20) lib/lp/soyuz/model/binarypackagerelease.py (+3/-3) lib/lp/soyuz/model/distributionsourcepackagerelease.py (+10/-6) lib/lp/soyuz/model/publishing.py (+6/-5) lib/lp/soyuz/model/queue.py (+2/-2) lib/lp/soyuz/model/sourcepackagerelease.py (+7/-5) lib/lp/soyuz/tests/test_binarypackagebuild.py (+28/-0) lib/lp/soyuz/tests/test_packageupload.py (+2/-2) Text conflict in lib/lp/buildmaster/interfaces/buildbase.py Text conflict in lib/lp/buildmaster/model/buildbase.py Text conflict in lib/lp/buildmaster/tests/test_buildbase.py Text conflict in lib/lp/code/model/sourcepackagerecipebuild.py |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-4 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Edwin Grubbs (community) | code | Approve | |
|
Review via email:
|
|||
Description of the change
This branch is part of a pipeline for
https:/
https:/
**Note**: If it's possible, please ignore the conflicts with db-devel - it's due to a reversion of some work that was in db-devel and that I'd already pumped through the pipeline, and I'm waiting for that work to land again on db-devel before re-merging and pumping.
The actual diff of this branch from the previous is:
http://
Overview
========
This branch continues the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/
It (finally) gets all the soyuz unit tests passing.
Details
=======
This branch just gets the remaining soyuz unit tests passing and starts on the soyuz doctests.
This branch is dependent on the pending schema patch in a previous branch.
To test
=======
First update the test db schema (required as the db patch still needs to be updated to remove the old build table):
psql launchpad_
bin/py database/
And then:
bin/test -vv -t test_packageupload -t doc/archive-
The next branch will continue getting the soyuz doctests passing with the new model.
Looks good.