openstack/swift
Code Issues Proposed changes

Merge "Minor improvement to updater unit tests"

Browse Source
This commit is contained in:
Jenkins
2015-10-26 09:29:48 +00:00
committed by Gerrit Code Review
parent a094560f0c 5d8d2e98ee
commit 246e134275
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/container/test_updater.py
View File

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

4
test/unit/obj/test_updater.py
View File

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