Merge lp:~mwhudson/launchpad/fix-test_min_time_to_next_builder-non-utc-bug-525329 into lp:launchpad

[Michael Hudson-Doyle]

test_min_time_to_next_builder fails in timezones ahead of UTC

As discussed in our standup.

[Aaron Bentley (abentley)]

review: Approve

[Tim Penhey (thumper)]

review: Approve

[Paul Hummer (rockstar)]

review: Approve (code)

[Māris Fogels (mars)]

review: Approve

=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-08 12:53:59 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-10 21:05:38 +0000
@@ -96,8 +96,7 @@
             queue_entry.lastscore)
 
 
-def check_mintime_to_builder(
-    test, bq, min_time, time_stamp=datetime.utcnow()):
+def check_mintime_to_builder(test, bq, min_time):
     """Test the estimated time until a builder becomes available."""
     # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
     # that's not too far in the future. This avoids spurious test failures.
@@ -113,7 +112,7 @@
     """Set remaining running time for job."""
     offset = bq.estimated_duration.seconds - remainder
     bq.setDateStarted(
-        datetime.utcnow().replace(tzinfo=utc) - timedelta(seconds=offset))
+        datetime.now(utc) - timedelta(seconds=offset))
 
 
 def check_delay_for_job(test, the_job, delay):
@@ -143,7 +142,7 @@
     # Use the date/time the job started if available.
     time_stamp = buildqueue.job.date_started
     if not time_stamp:
-        time_stamp = datetime.utcnow()
+        time_stamp = datetime.now(utc)
     buildqueue._now = lambda: time_stamp
     return time_stamp