Merge lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions into lp:offspring
Proposed by
Cody A.W. Somerville
Status: | Merged |
---|---|
Approved by: | Cody A.W. Somerville |
Approved revision: | 137 |
Merged at revision: | 135 |
Proposed branch: | lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions |
Merge into: | lp:offspring |
Diff against target: |
190 lines (+50/-20) 5 files modified
lib/offspring/master/scripts/publish_pending_releases.py (+12/-10) lib/offspring/master/scripts/sync_launchpad_project_milestones.py (+5/-4) lib/offspring/web/queuemanager/templatetags/lexbuilder_helpers.py (+5/-4) lib/offspring/web/queuemanager/tests/test_templatetags.py (+26/-0) setup.py (+2/-2) |
To merge this branch: | bzr merge lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timothy R. Chavez | Approve | ||
Review via email: mp+102755@code.launchpad.net |
Description of the change
This branch fixes a number of regressions that were introduced in late 2011 - how configuration in Offspring was changed but not all consumers of the API were updated and some functions that are console_entry shell scripts (setup tools thing) were moved but setup.py was not updated.
This branch also adds a (simple) test for the link_results templatetag which is responsible for generating the link to build results for the web front-end.
To post a comment you must log in.
Ok...
All web tests passed, ensure the patch covered all places needing to be replaced,
grep "config.web" -R * | wc -l ~/offspring- regressions$ !564 ~/offspring- regressions$ !567 ~/offspring- regressions$ bzr merge lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions web/queuemanage r/tests/ test_templateta gs.py master/ scripts/ publish_ pending_ releases. py master/ scripts/ sync_launchpad_ project_ milestones. py web/queuemanage r/templatetags/ lexbuilder_ helpers. py ~/offspring- regressions$ grep "config.web" -R * | wc -l ~/offspring- regressions$ grep "config.publisher" -R * | wc -l ~/offspring- regressions$ grep "config.web" -R * | wc -l
3
tim@burrito:
grep "config.publisher" -R * | wc -l
9
tim@burrito:
grep "config.web" -R * | wc -l
3
tim@burrito:
+N lib/offspring/
M lib/offspring/
M lib/offspring/
M lib/offspring/
M setup.py
All changes applied successfully.
tim@burrito:
0
tim@burrito:
0
tim@burrito:
0
I also ran sync_launchpad_ project_ milestones. run() from the Django shell without issue.