Merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-3 into lp://staging/launchpad/db-devel
| 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-binarypackagebuild-new-table-3 | ||||
| Merge into: | lp://staging/launchpad/db-devel | ||||
| Prerequisite: | lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-2 | ||||
| Diff against target: |
768 lines (+159/-90) (has conflicts) 15 files modified
lib/canonical/launchpad/security.py (+3/-2) lib/lp/buildmaster/model/buildbase.py (+18/-10) lib/lp/buildmaster/model/buildfarmjob.py (+9/-1) lib/lp/buildmaster/model/packagebuild.py (+4/-0) lib/lp/registry/model/sourcepackage.py (+10/-7) lib/lp/soyuz/configure.zcml (+2/-2) lib/lp/soyuz/model/archive.py (+17/-8) lib/lp/soyuz/model/binarypackagebuild.py (+25/-18) lib/lp/soyuz/model/publishing.py (+16/-9) lib/lp/soyuz/tests/test_archive.py (+12/-8) lib/lp/soyuz/tests/test_binarypackagebuild.py (+15/-7) lib/lp/soyuz/tests/test_buildpackagejob.py (+4/-2) lib/lp/soyuz/tests/test_hasbuildrecords.py (+9/-5) lib/lp/soyuz/tests/test_publishing.py (+13/-10) lib/lp/soyuz/tests/test_publishing_models.py (+2/-1) 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 |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-3 | ||||
| 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:/
**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 pushed 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/
Details
=======
This branch just gets 6 unit test modules passing again, by updating queries and attribute names as appropriate.
In some tests I've had to use removeSecurityProxy (where it wasn't used before). It is while setting attributes that should not be writable, but I'm not sure why they were writable before switching the models... if I've missed something obvious, please let me know!
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 soyuz.tests -t test_publishing -t test_binarypack
The next branch will continue getting the soyuz unit-tests passing with the new model.
| Abel Deuring (adeuring) | # |
