Merge lp:~thomir-deactivatedaccount/launchpad/devel-fix-package-rebuild-language into lp:launchpad

Proposed by Thomi Richards
Status: Merged
Merged at revision: 17357
Proposed branch: lp:~thomir-deactivatedaccount/launchpad/devel-fix-package-rebuild-language
Merge into: lp:launchpad
Diff against target: 25 lines (+2/-2)
2 files modified
lib/lp/soyuz/browser/build.py (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-build-record.txt (+1/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/launchpad/devel-fix-package-rebuild-language
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+250568@code.launchpad.net

Commit message

Change the text in a notification message when retrying a failed build.

Description of the change

Change the test in a notification message when retrying a failed build.

Note: I get three test failures when running:

./bin/test -t ".*build.*" -j 3 -c

however, I get exactly the same failures on devel.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/browser/build.py'
2--- lib/lp/soyuz/browser/build.py 2014-05-07 10:00:25 +0000
3+++ lib/lp/soyuz/browser/build.py 2015-02-23 00:25:32 +0000
4@@ -355,7 +355,7 @@
5
6 # Invoke context method to retry the build record.
7 self.context.retry()
8- self.request.response.addInfoNotification('Build retried')
9+ self.request.response.addInfoNotification('Build has been queued')
10
11 self.request.response.redirect(canonical_url(self.context))
12
13
14=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
15--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2014-11-27 22:13:36 +0000
16+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2015-02-23 00:25:32 +0000
17@@ -288,7 +288,7 @@
18 >>> admin_browser.getLink("Retry this build").click()
19 >>> admin_browser.getControl("Retry Build").click()
20 >>> print_feedback_messages(admin_browser.contents)
21- Build retried
22+ Build has been queued
23
24 >>> print extract_text(find_tag_by_id(admin_browser.contents, 'status'))
25 Build status