Merge lp:~gmb/launchpad/hide-update-now-on-success-bug-566605 into lp:launchpad

[Graham Binns]

The 'Update now' button will no longer appear for a bug watch whose latest update succeeded.

This branch fixes bug 566605 by preventing the "Update now" button from appearing for bug watches whose last update succeeded, regardless of how often they've failed in the past.

[Michael Nelson (michael.nelson)]

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/bugwatch.txt'
--- lib/lp/bugs/doc/bugwatch.txt	2010-04-23 11:19:49 +0000
+++ lib/lp/bugs/doc/bugwatch.txt	2010-05-14 13:11:29 +0000
@@ -537,7 +537,10 @@
 If the watch's updates have failed less than 60% of the time,
 can_be_rescheduled will be True
 
+    >>> import transaction
     >>> from lp.bugs.interfaces.bugwatch import BugWatchActivityStatus
+
+    >>> transaction.commit()
     >>> schedulable_watch.addActivity(
     ...     result=BugWatchActivityStatus.BUG_NOT_FOUND)
     >>> schedulable_watch.can_be_rescheduled
@@ -558,11 +561,32 @@
 needs attention in order for it to be able to work again.
 
     >>> schedulable_watch.next_check = None
+    >>> transaction.commit()
     >>> schedulable_watch.addActivity(
     ...     result=BugWatchActivityStatus.BUG_NOT_FOUND)
     >>> schedulable_watch.can_be_rescheduled
     False
 
+If the watch has run and failed only once, can_be_rescheduled will be
+true.
+
+    >>> from datetime import timedelta
+    >>> run_once_failed_once_watch = factory.makeBugWatch()
+    >>> run_once_failed_once_watch.next_check = (
+    ...     datetime.now(utc) + timedelta(days=7))
+    >>> run_once_failed_once_watch.addActivity(
+    ...     result=BugWatchActivityStatus.BUG_NOT_FOUND)
+    >>> run_once_failed_once_watch.can_be_rescheduled
+    True
+
+If the most recent update on the watch succeded, can_be_rescheduled will
+be False, regardless of the ratio of failures to successes.
+
+    >>> transaction.commit()
+    >>> run_once_failed_once_watch.addActivity()
+    >>> run_once_failed_once_watch.can_be_rescheduled
+    False
+
 
 Rescheduling a watch
 --------------------
@@ -575,6 +599,8 @@
 The schedulable_watch that we used in the previous test cannot currently
 be rescheduled.
 
+    >>> schedulable_watch = factory.makeBugWatch()
+    >>> schedulable_watch.next_check = None
     >>> schedulable_watch.can_be_rescheduled
     False
 
@@ -589,7 +615,8 @@
 If we add some activity to the watch, to make its can_be_rescheduled
 property become True, setNextCheck() will succeed.
 
-    >>> schedulable_watch.addActivity()
+    >>> schedulable_watch.addActivity(
+    ...     result=BugWatchActivityStatus.BUG_NOT_FOUND)
     >>> schedulable_watch.can_be_rescheduled
     True
 
 
=== modified file 'lib/lp/bugs/model/bugwatch.py'
--- lib/lp/bugs/model/bugwatch.py	2010-05-13 12:02:00 +0000
+++ lib/lp/bugs/model/bugwatch.py	2010-05-14 13:11:29 +0000
@@ -345,6 +345,11 @@
             # been checked.
             return False
 
+        if self.activity[0].result in BUG_WATCH_ACTIVITY_SUCCESS_STATUSES:
+            # If the last update was successful the watch can't be
+            # rescheduled.
+            return False
+
         if self.failed_activity.is_empty():
             # Don't show the reschedule button if the watch has never
             # failed.
 
=== modified file 'lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt'
--- lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-05-13 12:02:00 +0000
+++ lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-05-14 13:11:29 +0000
@@ -130,8 +130,6 @@
 
 For a new watch, the "Update Now" button isn't shown.
 
-    >>> from pytz import utc
-    >>> from datetime import datetime, timedelta
     >>> login('[e-mail]')
     >>> bug_watch = factory.makeBugWatch()
     >>> bug_watch.next_check = None
@@ -203,8 +201,6 @@
 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
@@ -222,3 +218,21 @@
     ...     user_browser.contents, 'informational message'):
     ...     print extract_text(message)
     The ... bug watch has been scheduled for immediate checking.
+
+However, once the watch succeeds the button will disappear, even though
+the watch has failed > 60% of the time. This is because the most recent
+check succeeded, so there's no point in allowing users to reschedule the
+watch for checking.
+
+    >>> from datetime import timedelta
+
+    >>> login('[e-mail]')
+    >>> bug_watch.next_check = datetime.now(utc) + timedelta(days=7)
+    >>> bug_watch.addActivity()
+    >>> logout()
+
+    >>> user_browser.open(watch_url)
+    >>> user_browser.getControl('Update Now')
+    Traceback (most recent call last):
+      ...
+    LookupError: label 'Update Now'