Merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-8 into lp://staging/launchpad/db-devel
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Graham Binns | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 9405 | ||||
| Proposed branch: | lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-8 | ||||
| Merge into: | lp://staging/launchpad/db-devel | ||||
| Prerequisite: | lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-7 | ||||
| Diff against target: |
296 lines (+41/-31) (has conflicts) 12 files modified
database/schema/pending/michaeln-build-generalisation.sql (+2/-4) lib/lp/archivepublisher/domination.py (+6/-5) lib/lp/archiveuploader/tests/test_buildduploads.py (+2/-2) lib/lp/archiveuploader/tests/test_ppauploadprocessor.py (+4/-4) lib/lp/archiveuploader/tests/test_securityuploads.py (+5/-5) lib/lp/archiveuploader/tests/test_uploadprocessor.py (+1/-1) lib/lp/buildmaster/model/buildfarmjob.py (+6/-1) lib/lp/code/interfaces/sourcepackagerecipebuild.py (+4/-0) lib/lp/code/model/sourcepackagerecipebuild.py (+1/-0) lib/lp/registry/doc/distroseries.txt (+1/-1) lib/lp/registry/model/distroseries.py (+5/-4) lib/lp/soyuz/model/buildpackagejob.py (+4/-4) Text conflict in lib/canonical/launchpad/security.py 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 Text conflict in lib/lp/code/model/tests/test_sourcepackagerecipebuild.py Text conflict in lib/lp/soyuz/model/binarypackagebuildbehavior.py |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-8 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch is part of a pipeline for
https:/
https:/
**Note**: The MP correctly mentions conflicts with db-devel but these shouldn't be in the displayed diff (against the previous branch). Some conflicts are 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.
Overview
========
This branch continues the work to switch our BinaryPackageBuild class to the new binarypackagebuild table (using the delegated PackageBuild/
This branch just ensures that the code, registry and translation tests continue to pass. It's mostly mechanical, although there is some SQL which was updated in a previous branch, but was apparently only tested in the translations code :/
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 -m code.tests -m translations.tests -m registry.tests -m archiveuploader
| Graham Binns (gmb) | # |
