From 34ae109173f0b5310d6f195056485623a0fd5fff Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@gmail.com>
Date: Thu, 28 Jan 2016 19:05:13 -0800
Subject: [PATCH] Tighten up to unittests to expect rounding
Change-Id: Ic453fd990ebbf17e0eeabc39b126d2bc14234e23
---
tests/unit/test_service.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py
index 7522e657..87008196 100644
--- a/tests/unit/test_service.py
+++ b/tests/unit/test_service.py
@@ -876,7 +876,7 @@ class TestServiceUpload(_TestServiceBase):
'status': 'uploaded',
'success': True,
}
- expected_mtime = float(os.path.getmtime(f.name))
+ expected_mtime = '%f' % os.path.getmtime(f.name)
mock_conn = mock.Mock()
mock_conn.put_object.return_value = ''
@@ -901,13 +901,13 @@ class TestServiceUpload(_TestServiceBase):
'use_slo': False,
'checksum': True})
- mtime = float(r['headers']['x-object-meta-mtime'])
- self.assertAlmostEqual(mtime, expected_mtime, delta=0.5)
+ mtime = r['headers']['x-object-meta-mtime']
+ self.assertEqual(expected_mtime, mtime)
del r['headers']['x-object-meta-mtime']
self.assertEqual(
'test_c_segments/%E3%83%86%E3%82%B9%E3%83%88/dummy.dat/' +
- '%f/30/10/' % mtime, r['headers']['x-object-manifest'])
+ '%s/30/10/' % mtime, r['headers']['x-object-manifest'])
del r['headers']['x-object-manifest']
self.assertEqual(r['path'], f.name)
@@ -1073,7 +1073,7 @@ class TestServiceUpload(_TestServiceBase):
'status': 'uploaded',
'success': True,
}
- expected_mtime = float(os.path.getmtime(f.name))
+ expected_mtime = '%f' % os.path.getmtime(f.name)
mock_conn = mock.Mock()
mock_conn.put_object.return_value = ''
@@ -1091,8 +1091,8 @@ class TestServiceUpload(_TestServiceBase):
'segment_size': 0,
'checksum': True})
- mtime = float(r['headers']['x-object-meta-mtime'])
- self.assertAlmostEqual(mtime, expected_mtime, delta=0.5)
+ mtime = r['headers']['x-object-meta-mtime']
+ self.assertEqual(expected_mtime, mtime)
del r['headers']['x-object-meta-mtime']
self.assertEqual(r['path'], f.name)