Merge lp:~gmb/launchpad/retry-rofo-watches-bug-566600 into lp:launchpad

[Graham Binns]

The "Update now" button will appear for bug watches which have run and failed once (previously the button would not have appeared for these watches).

This branch fixes bug 566600 by making BugWatch.can_be_rescheduled return true if the watch has been updated once and failed to update.

[Michael Nelson (michael.nelson)]

review: Approve (code)

=== modified file 'lib/lp/bugs/model/bugwatch.py'
--- lib/lp/bugs/model/bugwatch.py	2010-04-30 03:10:17 +0000
+++ lib/lp/bugs/model/bugwatch.py	2010-05-13 12:05:43 +0000
@@ -350,6 +350,11 @@
             # failed.
             return False
 
+        if self.failed_activity.count() == 1 and self.activity.count() == 1:
+            # In cases where a watch has been updated once and failed,
+            # we allow the user to reschedule it.
+            return True
+
         # If the ratio is lower than the reschedule threshold, we
         # can show the button.
         failure_ratio = (

=== modified file 'lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt'
--- lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-04-19 15:24:41 +0000
+++ lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-05-13 12:05:43 +0000
@@ -200,3 +200,25 @@
       ...
     LookupError: label 'Update Now'
 
+If a watch has run once and failed once, the reschedule button will be
+shown.
+
+    >>> from pytz import utc
+    >>> from datetime import datetime, timedelta
+    >>> login('[e-mail]')
+    >>> bug_watch = factory.makeBugWatch()
+    >>> bug_watch.next_check = None
+    >>> bug_watch.addActivity(result=BugWatchActivityStatus.BUG_NOT_FOUND)
+    >>> watch_url = (
+    ...     'http://bugs.launchpad.dev/bugs/%s/+watch/%s' %
+    ...     (bug_watch.bug.id, bug_watch.id))
+    >>> logout()
+
+    >>> user_browser.open(watch_url)
+    >>> reschedule_button = user_browser.getControl('Update Now')
+    >>> reschedule_button.click()
+
+    >>> for message in find_tags_by_class(
+    ...     user_browser.contents, 'informational message'):
+    ...     print extract_text(message)
+    The ... bug watch has been scheduled for immediate checking.