openstack/python-swiftclient
Code Issues Proposed changes

Tighten up to unittests to expect rounding

Browse Source 
Change-Id: Ic453fd990ebbf17e0eeabc39b126d2bc14234e23
This commit is contained in:
Clay Gerrard 2016-01-28 19:05:13 -08:00
parent 0fe02eb1c0
commit 34ae109173
1 changed files with 7 additions and 7 deletions

14
tests/unit/test_service.py

@ -876,7 +876,7 @@ class TestServiceUpload(_TestServiceBase):
'status': 'uploaded', 'status': 'uploaded',
'success': True, 'success': True,
} }
expected_mtime = float(os.path.getmtime(f.name)) expected_mtime = '%f' % os.path.getmtime(f.name)
mock_conn = mock.Mock() mock_conn = mock.Mock()
mock_conn.put_object.return_value = '' mock_conn.put_object.return_value = ''
@ -901,13 +901,13 @@ class TestServiceUpload(_TestServiceBase):
'use_slo': False, 'use_slo': False,
'checksum': True}) 'checksum': True})
mtime = float(r['headers']['x-object-meta-mtime']) mtime = r['headers']['x-object-meta-mtime']
self.assertAlmostEqual(mtime, expected_mtime, delta=0.5) self.assertEqual(expected_mtime, mtime)
del r['headers']['x-object-meta-mtime'] del r['headers']['x-object-meta-mtime']
self.assertEqual( self.assertEqual(
'test_c_segments/%E3%83%86%E3%82%B9%E3%83%88/dummy.dat/' + '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'] del r['headers']['x-object-manifest']
self.assertEqual(r['path'], f.name) self.assertEqual(r['path'], f.name)
@ -1073,7 +1073,7 @@ class TestServiceUpload(_TestServiceBase):
'status': 'uploaded', 'status': 'uploaded',
'success': True, 'success': True,
} }
expected_mtime = float(os.path.getmtime(f.name)) expected_mtime = '%f' % os.path.getmtime(f.name)
mock_conn = mock.Mock() mock_conn = mock.Mock()
mock_conn.put_object.return_value = '' mock_conn.put_object.return_value = ''
@ -1091,8 +1091,8 @@ class TestServiceUpload(_TestServiceBase):
'segment_size': 0, 'segment_size': 0,
'checksum': True}) 'checksum': True})
mtime = float(r['headers']['x-object-meta-mtime']) mtime = r['headers']['x-object-meta-mtime']
self.assertAlmostEqual(mtime, expected_mtime, delta=0.5) self.assertEqual(expected_mtime, mtime)
del r['headers']['x-object-meta-mtime'] del r['headers']['x-object-meta-mtime']
self.assertEqual(r['path'], f.name) self.assertEqual(r['path'], f.name)