1
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
2
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-08 12:53:59 +0000
3
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-10 21:05:38 +0000
4
@@ -96,8 +96,7 @@
5
96
            queue_entry.lastscore)
96
            queue_entry.lastscore)
6
97
97
7
98
98
10
99
def check_mintime_to_builder(
99
def check_mintime_to_builder(test, bq, min_time):
9
100
    test, bq, min_time, time_stamp=datetime.utcnow()):
11
101
    """Test the estimated time until a builder becomes available."""
100
    """Test the estimated time until a builder becomes available."""
12
102
    # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
101
    # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
13
103
    # that's not too far in the future. This avoids spurious test failures.
102
    # that's not too far in the future. This avoids spurious test failures.
14
@@ -113,7 +112,7 @@
15
113
    """Set remaining running time for job."""
112
    """Set remaining running time for job."""
16
114
    offset = bq.estimated_duration.seconds - remainder
113
    offset = bq.estimated_duration.seconds - remainder
17
115
    bq.setDateStarted(
114
    bq.setDateStarted(
19
116
        datetime.utcnow().replace(tzinfo=utc) - timedelta(seconds=offset))
115
        datetime.now(utc) - timedelta(seconds=offset))
20
117
116
21
118
117
22
119
def check_delay_for_job(test, the_job, delay):
118
def check_delay_for_job(test, the_job, delay):
23
@@ -143,7 +142,7 @@
24
143
    # Use the date/time the job started if available.
142
    # Use the date/time the job started if available.
25
144
    time_stamp = buildqueue.job.date_started
143
    time_stamp = buildqueue.job.date_started
26
145
    if not time_stamp:
144
    if not time_stamp:
28
146
        time_stamp = datetime.utcnow()
145
        time_stamp = datetime.now(utc)
29
147
    buildqueue._now = lambda: time_stamp
146
    buildqueue._now = lambda: time_stamp
30
148
    return time_stamp
147
    return time_stamp
31
149
148
Reviewer	Review Type	Date Requested	Status
Māris Fogels (community)			Approve on 2010-03-10
Paul Hummer (community)	code		Approve on 2010-03-10
Tim Penhey (community)			Approve on 2010-03-10
Aaron Bentley (community)		2010-03-10	Approve on 2010-03-10
Review via email: mp+21082@code.launchpad.net