openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Make time comparisons AlmostEqual to account for differing precision

Browse Source
This commit is contained in:
Adam Holmberg
2015-03-17 09:41:50 -05:00
parent af15b8aa0f
commit d4b462e01b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/test_time_util.py
View File

@@ -53,15 +53,17 @@ class TimeUtilTest(unittest.TestCase):
seq = 0x2aa5 seq = 0x2aa5
node = uuid.getnode() node = uuid.getnode()
u = util.uuid_from_time(t, node, seq) u = util.uuid_from_time(t, node, seq)
self.assertEqual(util.unix_time_from_uuid1(u), t) # using AlmostEqual because time precision is different for
# some platforms
self.assertAlmostEqual(util.unix_time_from_uuid1(u), t, 4)
self.assertEqual(u.node, node) self.assertEqual(u.node, node)
self.assertEqual(u.clock_seq, seq) self.assertEqual(u.clock_seq, seq)
# random node # random node
u1 = util.uuid_from_time(t, clock_seq=seq) u1 = util.uuid_from_time(t, clock_seq=seq)
u2 = util.uuid_from_time(t, clock_seq=seq) u2 = util.uuid_from_time(t, clock_seq=seq)
self.assertEqual(util.unix_time_from_uuid1(u1), t) self.assertAlmostEqual(util.unix_time_from_uuid1(u1), t, 4)
self.assertEqual(util.unix_time_from_uuid1(u2), t) self.assertAlmostEqual(util.unix_time_from_uuid1(u2), t, 4)
self.assertEqual(u.clock_seq, seq) self.assertEqual(u.clock_seq, seq)
# not impossible, but we shouldn't get the same value twice # not impossible, but we shouldn't get the same value twice
self.assertNotEqual(u1.node, u2.node) self.assertNotEqual(u1.node, u2.node)
@@ -69,8 +71,8 @@ class TimeUtilTest(unittest.TestCase):
# random seq # random seq
u1 = util.uuid_from_time(t, node=node) u1 = util.uuid_from_time(t, node=node)
u2 = util.uuid_from_time(t, node=node) u2 = util.uuid_from_time(t, node=node)
self.assertEqual(util.unix_time_from_uuid1(u1), t) self.assertAlmostEqual(util.unix_time_from_uuid1(u1), t, 4)
self.assertEqual(util.unix_time_from_uuid1(u2), t) self.assertAlmostEqual(util.unix_time_from_uuid1(u2), t, 4)
self.assertEqual(u.node, node) self.assertEqual(u.node, node)
# not impossible, but we shouldn't get the same value twice # not impossible, but we shouldn't get the same value twice
self.assertNotEqual(u1.clock_seq, u2.clock_seq) self.assertNotEqual(u1.clock_seq, u2.clock_seq)
@@ -86,7 +88,7 @@ class TimeUtilTest(unittest.TestCase):
# construct from datetime # construct from datetime
dt = util.datetime_from_timestamp(t) dt = util.datetime_from_timestamp(t)
u = util.uuid_from_time(dt, node, seq) u = util.uuid_from_time(dt, node, seq)
self.assertEqual(util.unix_time_from_uuid1(u), t) self.assertAlmostEqual(util.unix_time_from_uuid1(u), t, 4)
self.assertEqual(u.node, node) self.assertEqual(u.node, node)
self.assertEqual(u.clock_seq, seq) self.assertEqual(u.clock_seq, seq)