Merge lp:~divmod-dev/divmod.org/1210356-utc-test-failure into lp:divmod.org

Proposed by Tristan Seligmann
Status: Merged
Merged at revision: 2728
Proposed branch: lp:~divmod-dev/divmod.org/1210356-utc-test-failure
Merge into: lp:divmod.org
Diff against target: 36 lines (+7/-3)
1 file modified
Epsilon/epsilon/test/test_extime.py (+7/-3)
To merge this branch: bzr merge lp:~divmod-dev/divmod.org/1210356-utc-test-failure
Reviewer Review Type Date Requested Status
Laurens Van Houtven Approve
Review via email: mp+201391@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurens Van Houtven (lvh) wrote :

LGTM, merging

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Epsilon/epsilon/test/test_extime.py'
2--- Epsilon/epsilon/test/test_extime.py 2009-11-16 19:09:42 +0000
3+++ Epsilon/epsilon/test/test_extime.py 2014-01-13 13:42:41 +0000
4@@ -68,16 +68,20 @@
5 self.assertEquals(dtime.hour, 23)
6 self.assertEquals(dtime.minute, 12)
7
8+
9 def test_cmp(self):
10 now = time.gmtime()
11 self.assertEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(now))
12- self.assertNotEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(time.localtime()))
13+ self.assertNotEqual(
14+ extime.Time.fromStructTime(now),
15+ extime.Time.fromStructTime(now) + datetime.timedelta(seconds=42))
16 self.assertNotEquals(extime.Time.fromStructTime(now), 13)
17
18 aTime = extime.Time.fromStructTime(now)
19 for op in 'lt', 'le', 'gt', 'ge':
20 self.assertRaises(TypeError, getattr(operator, op), aTime, now)
21
22+
23 def test_fromNow(self):
24 diff = datetime.datetime.utcnow() - extime.Time()._time
25 if diff < datetime.timedelta():
26@@ -409,8 +413,8 @@
27 allDay = extime.Time.fromISO8601TimeAndDate('2005-123')
28 allDayNextYear = extime.Time.fromISO8601TimeAndDate('2006-123')
29 self.assertEquals(allDay.asHumanly(now=allDayNextYear), '3 May 2005')
30-
31-
32+
33+
34 def test_asHumanlyValidPrecision(self):
35 """
36 L{Time.asHumanly} should return the time in minutes by default, and

Subscribers

People subscribed via source and target branches

to all changes: