Merge lp:~gmb/launchpad/gbwnu-next-check-goodness-544943 into lp:launchpad/db-devel

[Graham Binns]

BugTracker.getBugWatchesNeedingUpdate() now looks at BugWatch.next_check rather than BugWatch.lastchecked.

This branch updates BugTracker.getBugWatchesNeedingUpdate() to use the BugWatch.next_check field rather than BugWatch.lastchecked to determine whether a bug watch needs to be updated.

I've updated the IBugTracker interface and BugTracker model accordingly, as well as associated tests. getBugWatchesNeedingUpdate() no longer accepts a hours_since_last_check parameter, so I've updated all the callsites to remove that.

[Eleanor Berger (intellectronica)]

review: Approve (code)

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2010-03-21 16:57:00 +0000
+++ database/sampledata/current.sql	2010-03-24 22:10:48 +0000
@@ -2486,7 +2486,7 @@
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (54, '[e-mail]', 30, 4, '2006-10-16 18:31:43.626521', NULL);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (55, '[e-mail]', 29, 1, '2006-10-16 18:31:43.626932', 291);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (56, '[e-mail]', 28, 2, '2006-10-16 18:31:43.627318', 281);
-INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (57, '[e-mail]', 62, 1, '2006-10-16 18:31:43.62774', 621);
+INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (57, '[e-mail]', 62, 4, '2006-10-16 18:31:43.62774', 621);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (58, '[e-mail]', 63, 4, '2006-10-16 18:31:43.628123', 631);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (59, '[e-mail]', 10, 4, '2006-10-16 18:31:43.628504', 101);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (60, '[e-mail]', 65, 4, '2006-10-17 23:23:23.232323', 651);

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-03-19 17:42:12 +0000
+++ lib/lp/bugs/configure.zcml	2010-03-24 22:10:48 +0000
@@ -839,6 +839,7 @@
                     lastchanged
                     lastchecked
                     needscheck
+                    next_check
                     owner
                     remote_importance
                     remotebug
@@ -858,7 +859,14 @@
                     addComment
                     updateImportance
                     updateStatus"
-                set_attributes="last_error_type lastchanged lastchecked needscheck                                                                                                 remote_importance remotestatus"/>
+                set_attributes="
+                    last_error_type
+                    lastchanged
+                    lastchecked
+                    needscheck
+                    next_check
+                    remote_importance
+                    remotestatus"/>
         </class>
 
         <!-- https://launchpad.net/bugs/98639 -->

=== modified file 'lib/lp/bugs/doc/bugtracker.txt'
--- lib/lp/bugs/doc/bugtracker.txt	2010-03-22 10:36:53 +0000
+++ lib/lp/bugs/doc/bugtracker.txt	2010-03-24 22:10:48 +0000
@@ -16,7 +16,7 @@
 
     >>> def print_watches(bugtracker):
     ...     watches = sorted(
-    ...         bugtracker.getBugWatchesNeedingUpdate(23),
+    ...         bugtracker.getBugWatchesNeedingUpdate(),
     ...         key=lambda watch: (watch.remotebug, watch.bug.id))
     ...
     ...     for bug_watch in watches:
@@ -28,8 +28,8 @@
     >>> login('[e-mail]')
 
 We can get a list of all the bug tracker's bug watches needing to be
-updated.  The current criteria for needing a update is that it hasn't
-been updated in the last 23 hours.
+updated. A bug watch is considered to be needing an update when its
+next_check time is in the past.
 
     >>> bug_watches = mozilla_bugzilla.watches
     >>> print bug_watches.count()
@@ -37,7 +37,7 @@
 
     >>> print bug_watches[0].remotebug, bug_watches[0].bug.id
     2000 1
-    >>> bug_watches[0].lastchecked = None
+    >>> bug_watches[0].next_check = now - timedelta(hours=1)
 
     >>> print bug_watches[1].remotebug, bug_watches[1].bug.id
     123543 1
@@ -48,11 +48,11 @@
 
     >>> print bug_watches[2].remotebug, bug_watches[2].bug.id
     42 1
-    >>> bug_watches[2].lastchecked = now - timedelta(hours=36)
+    >>> bug_watches[2].next_check = now - timedelta(hours=36)
 
     >>> print bug_watches[3].remotebug, bug_watches[3].bug.id
     42 2
-    >>> bug_watches[3].lastchecked = now - timedelta(days=1)
+    >>> bug_watches[3].next_check = now - timedelta(days=1)
 
 The watches needing updating should the ones with old statuses, 2000 and 42:
 
@@ -593,31 +593,34 @@
 resetWatches() method.
 
     >>> from operator import attrgetter
+    >>> from pytz import utc
+    >>> definitely_now = datetime.now(utc)
 
     >>> def print_tracker_watch_times(bugtracker):
     ...     for watch in sorted(
     ...         bugtracker.watches, key=attrgetter('id')):
-    ...         if watch.lastchecked is not None:
-    ...             print watch.bug.id, "not None"
+    ...         if watch.next_check != definitely_now:
+    ...             print watch.bug.id, "not now"
     ...         else:
-    ...             print watch.bug.id, watch.lastchecked
+    ...             print watch.bug.id, "now"
 
     >>> print_tracker_watch_times(mozilla_bugzilla)
-    2 not None
-    1 None
-    1 not None
-    1 not None
-
-Calling resetWatches() on mozilla_bugzilla will set all its
-lastchecked times to None.
-
-    >>> mozilla_bugzilla.resetWatches()
+    2 not now
+    1 not now
+    1 not now
+    1 not now
+
+Calling resetWatches() on mozilla_bugzilla will set all its next_check
+times to datetime.now(). For testing purposes, we'll pass it a value to
+use in place of now().
+
+    >>> mozilla_bugzilla.resetWatches(now=definitely_now)
     >>> transaction.commit()
     >>> print_tracker_watch_times(mozilla_bugzilla)
-    2 None
-    1 None
-    1 None
-    1 None
+    2 now
+    1 now
+    1 now
+    1 now
 
 resetWatches() also clears the last_error_type field of the watches.
 

=== modified file 'lib/lp/bugs/doc/checkwatches.txt'
--- lib/lp/bugs/doc/checkwatches.txt	2010-03-24 06:53:49 +0000
+++ lib/lp/bugs/doc/checkwatches.txt	2010-03-24 22:10:48 +0000
@@ -103,6 +103,8 @@
 
 First, we create some bug watches to test with:
 
+    >>> from datetime import datetime
+    >>> from pytz import utc
     >>> from canonical.launchpad.database import BugTracker
     >>> from canonical.launchpad.interfaces import (
     ...     BugTrackerType, IBugSet)
@@ -128,6 +130,7 @@
     >>> example_bugwatch = example_bug.addWatch(
     ...     example_bug_tracker, '1',
     ...     getUtility(ILaunchpadCelebrities).janitor)
+    >>> example_bugwatch.next_check = datetime.now(utc)
 
     >>> login('[e-mail]')
 
@@ -206,7 +209,7 @@
     ...         bugtrackertype.name, bugtracker.name)
 
     >>> login(ANONYMOUS)
-    >>> example_bugwatch.lastchecked = None
+    >>> example_bugwatch.next_check = datetime.now(utc)
     >>> try:
     ...     externalbugtracker.get_external_bugtracker = (
     ...         broken_get_external_bugtracker)
@@ -242,6 +245,7 @@
     ...     example_bugwatch = example_bug.addWatch(
     ...         example_bug_tracker, str(bug_id),
     ...         getUtility(ILaunchpadCelebrities).janitor)
+    ...     example_bugwatch.next_check = datetime.now(utc)
 
 Since we know how many bugwatches example_bug has we will be able to see
 when checkwatches only updates a subset of them.
@@ -294,15 +298,13 @@
 We'll set the lastchecked time on that Savannah instance to make sure
 that it looks as though it has been updated recently
 
-    >>> import pytz
-    >>> from datetime import datetime
     >>> login('[e-mail]')
     >>> for watch in savannah.watches:
-    ...     watch.lastchecked = datetime.now(pytz.timezone('UTC'))
+    ...     watch.lastchecked = datetime.now(utc)
 
 So our Savannah instance now has no watches that need checking.
 
-    >>> savannah.getBugWatchesNeedingUpdate(23).count()
+    >>> savannah.getBugWatchesNeedingUpdate().count()
     0
 
 However, forceUpdateAll() will update every watch, whether they've
@@ -368,10 +370,11 @@
     ...     def _updateBugTracker(self, bug_tracker, batch_size):
     ...         # Update as many watches as the batch size says.
     ...         watches_to_update = (
-    ...             bug_tracker.getBugWatchesNeedingUpdate(23)[:batch_size])
+    ...             bug_tracker.getBugWatchesNeedingUpdate()[:batch_size])
     ...
     ...         for watch in watches_to_update:
-    ...             watch.lastchecked = datetime.now(pytz.timezone('UTC'))
+    ...             watch.lastchecked = datetime.now(utc)
+    ...             watch.next_check = None
 
     >>> non_connecting_updater = NonConnectingUpdater(transaction)
     >>> non_connecting_updater.log = FakeLogger()
@@ -397,8 +400,6 @@
 
 We'll create a non-functioning ExternalBugtracker to demonstrate this.
 
-    >>> import pytz
-    >>> from datetime import datetime
     >>> from zope.interface import implements
     >>> from lp.bugs.interfaces.bugtask import (
     ...     BugTaskStatus, BugTaskImportance)
@@ -407,7 +408,7 @@
     ...     ISupportsBackLinking)
     >>> from lp.bugs.externalbugtracker.base import ExternalBugTracker
 
-    >>> nowish = datetime.now(pytz.timezone('UTC'))
+    >>> nowish = datetime.now(utc)
     >>> class UselessExternalBugTracker(ExternalBugTracker):
     ...
     ...     implements(

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-03-19 16:47:08 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-03-24 22:10:48 +0000
@@ -422,7 +422,7 @@
 
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> flush_database_updates()
-    >>> gnome_bugzilla.getBugWatchesNeedingUpdate(23).count()
+    >>> gnome_bugzilla.getBugWatchesNeedingUpdate().count()
     0
 
 If the status isn't different, the lastchanged attribute doesn't get

=== modified file 'lib/lp/bugs/doc/externalbugtracker-debbugs.txt'
--- lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-01-06 14:35:52 +0000
+++ lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-03-24 22:10:48 +0000
@@ -91,13 +91,27 @@
 
     >>> from canonical.launchpad.interfaces import IBugTrackerSet
     >>> debbugs = getUtility(IBugTrackerSet).getByName('debbugs')
-    >>> bug_watches = list(debbugs.getBugWatchesNeedingUpdate(23))
+    >>> bug_watches = list(debbugs.getBugWatchesNeedingUpdate())
+    >>> len(bug_watches)
+    0
+
+It looks as though there are no bug watches needing to be updated.
+That's because the check for whether a bug watch needs to be updated
+looks at its next_check field, which is None by default. Updating the
+bug watches should solve that problem.
+
+    >>> from datetime import datetime
+    >>> from pytz import utc
+    >>> for watch in debbugs.watches:
+    ...     watch.next_check = datetime.now(utc)
+
+    >>> bug_watches = list(debbugs.getBugWatchesNeedingUpdate())
     >>> len(bug_watches)
     5
 
-Log in and kick off the update. The importing of comments, which is
-controlled by a configuration option, is disabled here and will be
-tested later.
+Now there are some watches to update we can run the update against them.
+The importing of comments, which is controlled by a configuration
+option, is disabled here and will be tested later.
 
     >>> from lp.bugs.scripts.checkwatches import BugWatchUpdater
     >>> bug_watch_updater = BugWatchUpdater(txn)
@@ -116,11 +130,11 @@
     327549: open important security
     308994: open important
 
-The lastchecked attribute got updated for each bug watch, so no more
-watches are in need of an update.
+The next_check value for all the watches got set to null when they
+were updated, so there are no watches left needing an update.
 
     >>> flush_database_updates()
-    >>> watches = debbugs.getBugWatchesNeedingUpdate(23)
+    >>> watches = debbugs.getBugWatchesNeedingUpdate()
     >>> watches.count()
     0
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt'
--- lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2009-10-09 20:56:00 +0000
+++ lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2010-03-24 22:10:48 +0000
@@ -164,7 +164,7 @@
 
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> flush_database_updates()
-    >>> example_bug_tracker.getBugWatchesNeedingUpdate(23).count()
+    >>> example_bug_tracker.getBugWatchesNeedingUpdate().count()
     0
 
 If the status isn't different, the lastchanged attribute doesn't get

=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis.txt'
--- lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-03-17 13:40:49 +0000
+++ lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-03-24 22:10:48 +0000
@@ -179,7 +179,7 @@
 
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> flush_database_updates()
-    >>> example_bug_tracker.getBugWatchesNeedingUpdate(23).count()
+    >>> example_bug_tracker.getBugWatchesNeedingUpdate().count()
     0
 
 If the status isn't different, the lastchanged attribute doesn't get

=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-01-11 13:54:42 +0000
+++ lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-03-24 22:10:48 +0000
@@ -369,7 +369,7 @@
 now no bug watches are in need of updating:
 
     >>> flush_database_updates()
-    >>> example_bug_tracker.getBugWatchesNeedingUpdate(23).count()
+    >>> example_bug_tracker.getBugWatchesNeedingUpdate().count()
     0
 
 If the status isn't different, the lastchanged attribute doesn't get

=== modified file 'lib/lp/bugs/interfaces/bugtracker.py'
--- lib/lp/bugs/interfaces/bugtracker.py	2010-03-10 19:00:59 +0000
+++ lib/lp/bugs/interfaces/bugtracker.py	2010-03-24 22:10:48 +0000
@@ -273,12 +273,11 @@
     def getBugsWatching(remotebug):
         """Get the bugs watching the given remote bug in this bug tracker."""
 
-    def getBugWatchesNeedingUpdate(hours_since_last_check):
+    def getBugWatchesNeedingUpdate():
         """Get the bug watches needing to be updated.
 
-        All bug watches not being updated for the last
-        :hours_since_last_check: hours are considered needing to be
-        updated.
+        All bug watches with a next_check time in the past are
+        considered to be needing an update.
         """
 
     def getLinkedPersonByName(name):
@@ -318,8 +317,13 @@
     def destroySelf():
         """Delete this bug tracker."""
 
-    def resetWatches():
-        """Reset the lastchecked times of this BugTracker's `BugWatch`es."""
+    def resetWatches(now=None):
+        """Reset the next_check times of this BugTracker's `BugWatch`es.
+
+        :param now: If specified, contains the datetime to which to set
+                    the BugWatches' next_check times. Defaults to
+                    datetime.now().
+        """
 
 
 class IBugTrackerSet(Interface):

=== modified file 'lib/lp/bugs/interfaces/bugwatch.py'
--- lib/lp/bugs/interfaces/bugwatch.py	2010-03-22 10:36:53 +0000
+++ lib/lp/bugs/interfaces/bugwatch.py	2010-03-24 22:10:48 +0000
@@ -136,6 +136,9 @@
         Reference(title=_('Owner'), required=True,
                   readonly=True, schema=Interface))
     activity = Attribute('The activity history of this BugWatch.')
+    next_check = exported(
+        Datetime(title=_('Next Check')),
+        exported_as='date_next_checked')
 
     # Useful joins.
     bugtasks = exported(

=== modified file 'lib/lp/bugs/model/bugtracker.py'
--- lib/lp/bugs/model/bugtracker.py	2009-12-09 14:55:30 +0000
+++ lib/lp/bugs/model/bugtracker.py	2010-03-24 22:10:48 +0000
@@ -25,7 +25,7 @@
     BoolCol, ForeignKey, OR, SQLMultipleJoin, SQLObjectNotFound, StringCol)
 from sqlobject.sqlbuilder import AND
 
-from storm.expr import Or
+from storm.expr import Not, Or
 from storm.locals import Bool
 from storm.store import Store
 
@@ -348,26 +348,19 @@
                                     distinct=True,
                                     orderBy=['datecreated']))
 
-    def getBugWatchesNeedingUpdate(self, hours_since_last_check):
+    def getBugWatchesNeedingUpdate(self):
         """See `IBugTracker`.
 
         :return: The UNION of the bug watches that need checking and
             those with unpushed comments.
         """
-        lastchecked_cutoff = (
-            datetime.now(timezone('UTC')) -
-            timedelta(hours=hours_since_last_check))
-
-        lastchecked_clause = Or(
-            BugWatch.lastchecked < lastchecked_cutoff,
-            BugWatch.lastchecked == None)
-
         store = Store.of(self)
 
         bug_watches_needing_checking = store.find(
             BugWatch,
             BugWatch.bugtracker == self,
-            lastchecked_clause)
+            Not(BugWatch.next_check == None),
+            BugWatch.next_check <= datetime.now(timezone('UTC')))
 
         bug_watches_with_unpushed_comments = store.find(
             BugWatch,
@@ -486,12 +479,15 @@
 
         return person
 
-    def resetWatches(self):
+    def resetWatches(self, now=None):
         """See `IBugTracker`."""
+        if now is None:
+            now = datetime.now(timezone('UTC'))
+
         store = Store.of(self)
         store.execute(
-            "UPDATE BugWatch SET lastchecked = NULL WHERE bugtracker = %s" %
-            sqlvalues(self))
+            "UPDATE BugWatch SET next_check = %s WHERE bugtracker = %s" %
+            sqlvalues(now, self))
 
 
 class BugTrackerSet:

=== modified file 'lib/lp/bugs/model/bugwatch.py'
--- lib/lp/bugs/model/bugwatch.py	2010-03-22 13:57:43 +0000
+++ lib/lp/bugs/model/bugwatch.py	2010-03-24 22:10:48 +0000
@@ -83,6 +83,7 @@
     owner = ForeignKey(
         dbName='owner', foreignKey='Person',
         storm_validator=validate_public_person, notNull=True)
+    next_check = UtcDateTimeCol()
 
     @property
     def bugtasks(self):

=== modified file 'lib/lp/bugs/scripts/checkwatches.py'
--- lib/lp/bugs/scripts/checkwatches.py	2010-03-24 06:53:49 +0000
+++ lib/lp/bugs/scripts/checkwatches.py	2010-03-24 22:10:48 +0000
@@ -408,7 +408,7 @@
             self.txn.begin()
             if not self.updateBugTracker(bug_tracker, batch_size):
                 break
-            watches_left = bug_tracker.getBugWatchesNeedingUpdate(23).count()
+            watches_left = bug_tracker.getBugWatchesNeedingUpdate().count()
             self.log.info(
                 "%s watches left to check on bug tracker '%s'" %
                 (watches_left, bug_tracker_name))
@@ -466,16 +466,7 @@
 
     def _updateBugTracker(self, bug_tracker, batch_size=None):
         """Updates the given bug trackers's bug watches."""
-        # XXX 2007-01-18 gmb:
-        #     Once we start running checkwatches more frequently we need
-        #     to update the comment and the call to
-        #     getBugWatchesNeedingUpdate() below. We'll be checking
-        #     those watches which haven't been checked for 24 hours, not
-        #     23.
-        # We want 1 day, but we'll use 23 hours because we can't count
-        # on the cron job hitting exactly the same time every day
-        bug_watches_to_update = (
-            bug_tracker.getBugWatchesNeedingUpdate(23))
+        bug_watches_to_update = bug_tracker.getBugWatchesNeedingUpdate()
 
         if bug_watches_to_update.count() > 0:
             # XXX: GavinPanella 2010-01-18 bug=509223 : Ask remote
@@ -495,6 +486,7 @@
                 for bug_watch in bug_watches_to_update:
                     bug_watch.last_error_type = error_type
                     bug_watch.lastchecked = UTC_NOW
+                    bug_watch.next_check = None
 
                 message = (
                     "ExternalBugtracker for BugTrackerType '%s' is not "
@@ -734,6 +726,7 @@
             for bug_watch_id in bug_watch_ids:
                 bugwatch = getUtility(IBugWatchSet).get(bug_watch_id)
                 bugwatch.lastchecked = UTC_NOW
+                bugwatch.next_check = None
                 bugwatch.last_error_type = errortype
             self.txn.commit()
             raise
@@ -764,6 +757,7 @@
             for bug_watch_id in bug_watch_ids:
                 bugwatch = getUtility(IBugWatchSet).get(bug_watch_id)
                 bugwatch.lastchecked = UTC_NOW
+                bugwatch.next_check = None
                 bugwatch.last_error_type = errortype
             self.txn.commit()
             raise
@@ -817,6 +811,7 @@
 
             for bug_watch in bug_watches:
                 bug_watch.lastchecked = UTC_NOW
+                bug_watch.next_check = None
             if remote_bug_id in unmodified_remote_ids:
                 continue
 
@@ -911,6 +906,7 @@
                 errortype = get_bugwatcherrortype_for_error(error)
                 for bug_watch in bug_watches:
                     bug_watch.lastchecked = UTC_NOW
+                    bug_watch.next_check = None
                     bug_watch.last_error_type = errortype
                     bug_watch.addActivity(result=errortype, oops_id=oops_id)
                 # We need to commit the transaction, in case the next

=== modified file 'lib/lp/bugs/scripts/tests/test_bugimport.py'
--- lib/lp/bugs/scripts/tests/test_bugimport.py	2010-03-23 11:39:09 +0000
+++ lib/lp/bugs/scripts/tests/test_bugimport.py	2010-03-24 22:10:48 +0000
@@ -825,7 +825,7 @@
         self.test_bug_one = test_bug_one
         self.test_bug_two = test_bug_two
 
-    def getBugWatchesNeedingUpdate(self, hours):
+    def getBugWatchesNeedingUpdate(self):
         """Returns a sequence of teo bug watches for testing."""
         return TestResultSequence([
             TestBugWatch(1, self.test_bug_one, failing=True),
@@ -905,7 +905,7 @@
         """
         return [
             bug_watch for bug_watch in (
-                self.bugtracker.getBugWatchesNeedingUpdate(0))
+                self.bugtracker.getBugWatchesNeedingUpdate())
             if (bug_watch.remotebug == remote_bug_id and
                 bug_watch.id in bug_watch_ids)
             ]

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-03-22 23:02:50 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-03-24 22:10:48 +0000
@@ -1025,6 +1025,7 @@
   date_created: u'2004-10-04T01:00:00+00:00'
   date_last_changed: u'2004-10-04T01:00:00+00:00'
   date_last_checked: u'2004-10-04T01:00:00+00:00'
+  date_next_checked: None
   last_error_type: None
   owner_link: u'http://.../~mark'
   remote_bug: u'2000'
@@ -1096,6 +1097,7 @@
   date_created: u'...'
   date_last_changed: None
   date_last_checked: None
+  date_next_checked: None
   last_error_type: None
   owner_link: u'http://.../~salgado'
   remote_bug: u'9876'

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-03-22 07:20:05 +0000
+++ lib/lp/testing/factory.py	2010-03-24 22:10:48 +0000
@@ -1209,9 +1209,17 @@
         if owner is None:
             owner = self.makePerson()
 
-        return getUtility(IBugWatchSet).createBugWatch(
+        bug_watch = getUtility(IBugWatchSet).createBugWatch(
             bug, owner, bugtracker, str(remote_bug))
 
+        # You need to be an admin to set next_check on a BugWatch.
+        def set_next_check(bug_watch):
+            bug_watch.next_check = datetime.now(pytz.timezone('UTC'))
+
+        person = getUtility(IPersonSet).getByName('name16')
+        run_with_login(person, set_next_check, bug_watch)
+        return bug_watch
+
     def makeBugAttachment(self, bug=None, owner=None, data=None,
                           comment=None, filename=None, content_type=None,
                           description=None, is_patch=_DEFAULT):