Merge "Minor improvement to updater unit tests"

This commit is contained in:
Jenkins 2015-10-26 09:29:48 +00:00 committed by Gerrit Code Review
commit 246e134275
2 changed files with 4 additions and 4 deletions

View File

@ -64,14 +64,14 @@ class TestContainerUpdater(unittest.TestCase):
'swift_dir': self.testdir,
'interval': '1',
'concurrency': '2',
'node_timeout': '5.',
'node_timeout': '5.5',
})
self.assertTrue(hasattr(cu, 'logger'))
self.assertTrue(cu.logger is not None)
self.assertEqual(cu.devices, self.devices_dir)
self.assertEqual(cu.interval, 1)
self.assertEqual(cu.concurrency, 2)
self.assertEqual(cu.node_timeout, 5.)
self.assertEqual(cu.node_timeout, 5.5)
self.assertTrue(cu.get_account_ring() is not None)
@mock.patch.object(container_updater, 'ismount')

View File

@ -84,13 +84,13 @@ class TestObjectUpdater(unittest.TestCase):
'swift_dir': self.testdir,
'interval': '1',
'concurrency': '2',
'node_timeout': '5.'})
'node_timeout': '5.5'})
self.assertTrue(hasattr(cu, 'logger'))
self.assertTrue(cu.logger is not None)
self.assertEqual(cu.devices, self.devices_dir)
self.assertEqual(cu.interval, 1)
self.assertEqual(cu.concurrency, 2)
self.assertEqual(cu.node_timeout, 5.)
self.assertEqual(cu.node_timeout, 5.5)
self.assertTrue(cu.get_container_ring() is not None)
@mock.patch('os.listdir')