Merge lp://staging/~abentley/launchpad/revert-enums into lp://staging/launchpad

Proposed by Aaron Bentley
Status: Merged
Approved by: Edwin Grubbs
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~abentley/launchpad/revert-enums
Merge into: lp://staging/launchpad
Diff against target: 513 lines (+77/-68)
12 files modified
lib/lp/buildmaster/interfaces/buildbase.py (+6/-6)
lib/lp/code/browser/sourcepackagerecipe.py (+14/-4)
lib/lp/soyuz/doc/build-failedtoupload-workflow.txt (+1/-1)
lib/lp/soyuz/doc/build-notification.txt (+2/-2)
lib/lp/soyuz/doc/build.txt (+1/-1)
lib/lp/soyuz/doc/buildd-mass-retry.txt (+4/-4)
lib/lp/soyuz/doc/buildd-slavescanner.txt (+6/-6)
lib/lp/soyuz/doc/gina.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-build-record.txt (+10/-11)
lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt (+30/-30)
lib/lp/soyuz/stories/soyuz/xx-private-builds.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~abentley/launchpad/revert-enums
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) Approve
Review via email: mp+23416@code.staging.launchpad.net

Description of the change

= Summary =
Fix bug #559143:
  Build status title changes break API and uglify forms

== Proposed fix ==
Revert BuildStatus enum titles to previous values.

== Pre-implementation notes ==
Discussed with bigjools

== Implementation details ==
Various tests which had been updated to the new values had to be returned to
their previous state.

== Tests ==
bin/test -t browser test_sourcepackagerecipe
bin/test -t build-failedtoupload-workflow.txt -t build-notification.txt -t build.txt -t buildd-mass-retry.txt -t buildd-slavescanner.txt -t gina.txt -t xx-copy-packages.txt -t xx-build-record.txt -t xx-builds-pages.txt -t xx-private-builds.txt

== Demo and Q/A ==
https://edge.launchpad.net/ubuntu/+builds should show the old title values.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/doc/gina.txt
  lib/lp/soyuz/doc/buildd-slavescanner.txt
  lib/lp/soyuz/doc/build-failedtoupload-workflow.txt
  lib/lp/soyuz/stories/soyuz/xx-build-record.txt
  lib/lp/soyuz/stories/ppa/xx-copy-packages.txt
  lib/lp/soyuz/doc/build-notification.txt
  lib/lp/soyuz/stories/soyuz/xx-private-builds.txt
  lib/lp/soyuz/doc/buildd-mass-retry.txt
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/buildmaster/interfaces/buildbase.py
  lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt
  lib/lp/soyuz/doc/build.txt

== Pyflakes Doctest notices ==

lib/lp/soyuz/doc/buildd-slavescanner.txt
    689: local variable 'pub_binaries' is assigned to but never used

== Pylint notices ==

lib/lp/code/browser/sourcepackagerecipe.py
    11: [F0401] Unable to import 'canonical.launchpad.webapp'
    13: [F0401] Unable to import 'lp.buildmaster.interfaces.buildbase'

lib/lp/buildmaster/interfaces/buildbase.py
    17: [F0401] Unable to import 'zope.schema'
    18: [F0401] Unable to import 'lazr.enum'
    19: [F0401] Unable to import 'lazr.restful.declarations'
    20: [F0401] Unable to import 'lazr.restful.fields'
    22: [F0401] Unable to import 'lp.buildmaster.interfaces.builder'
    23: [F0401] Unable to import 'lp.buildmaster.interfaces.buildqueue'
    24: [F0401] Unable to import 'lp.registry.interfaces.distribution'
    25: [F0401] Unable to import 'lp.registry.interfaces.pocket'
    26: [F0401] Unable to import 'lp.soyuz.interfaces.archive'
    27: [F0401] Unable to import 'canonical.launchpad.interfaces.librarian'
    28: [F0401] Unable to import 'canonical.launchpad'

To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.