diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-01 10:09:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-01 10:09:07 +0000 |
| commit | e5f058e27ed45af7e06c1d531833279d5f8ef6fe (patch) | |
| tree | 272402a0a7294e13e6d1f12ce160179645a0bef2 | |
| parent | 6f431ee0653a4c7030b2d66f673bc9374e10896d (diff) | |
| parent | 34ae109173f0b5310d6f195056485623a0fd5fff (diff) | |
| download | python-swiftclient-e5f058e27ed45af7e06c1d531833279d5f8ef6fe.tar.gz | |
Merge "Tighten up to unittests to expect rounding"
| -rw-r--r-- | tests/unit/test_service.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py index 7522e65..8700819 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) |