← Back to team overview

divmod-dev team mailing list archive

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

 

Tristan Seligmann has proposed merging lp:~divmod-dev/divmod.org/1210356-utc-test-failure into lp:divmod.org.

Requested reviews:
  Divmod-dev (divmod-dev)
Related bugs:
  Bug #1210356 in Epsilon: "epsilon.test.test_extime.TestTime.test_cmp fails when local time is UTC"
  https://bugs.launchpad.net/epsilon/+bug/1210356

For more details, see:
https://code.launchpad.net/~divmod-dev/divmod.org/1210356-utc-test-failure/+merge/201391
-- 
https://code.launchpad.net/~divmod-dev/divmod.org/1210356-utc-test-failure/+merge/201391
Your team Divmod-dev is requested to review the proposed merge of lp:~divmod-dev/divmod.org/1210356-utc-test-failure into lp:divmod.org.
=== modified file 'Epsilon/epsilon/test/test_extime.py'
--- Epsilon/epsilon/test/test_extime.py	2009-11-16 19:09:42 +0000
+++ Epsilon/epsilon/test/test_extime.py	2014-01-13 13:42:41 +0000
@@ -68,16 +68,20 @@
         self.assertEquals(dtime.hour, 23)
         self.assertEquals(dtime.minute, 12)
 
+
     def test_cmp(self):
         now = time.gmtime()
         self.assertEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(now))
-        self.assertNotEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(time.localtime()))
+        self.assertNotEqual(
+            extime.Time.fromStructTime(now),
+            extime.Time.fromStructTime(now) + datetime.timedelta(seconds=42))
         self.assertNotEquals(extime.Time.fromStructTime(now), 13)
 
         aTime = extime.Time.fromStructTime(now)
         for op in 'lt', 'le', 'gt', 'ge':
             self.assertRaises(TypeError, getattr(operator, op), aTime, now)
 
+
     def test_fromNow(self):
         diff = datetime.datetime.utcnow() - extime.Time()._time
         if diff < datetime.timedelta():
@@ -409,8 +413,8 @@
         allDay = extime.Time.fromISO8601TimeAndDate('2005-123')
         allDayNextYear = extime.Time.fromISO8601TimeAndDate('2006-123')
         self.assertEquals(allDay.asHumanly(now=allDayNextYear), '3 May 2005')
-    
-    
+
+
     def test_asHumanlyValidPrecision(self):
         """
         L{Time.asHumanly} should return the time in minutes by default, and


References