openstack/swift
Code Issues Proposed changes

Merge "Don't require swift be installed to have passing manager tests"

Browse Source
This commit is contained in:
Zuul 2021-03-19 19:00:05 +00:00 committed by Gerrit Code Review
commit a7b9d1ea69
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/common/test_manager.py
View File

@ -1725,10 +1725,11 @@ class TestManager(unittest.TestCase):
self.assertTrue(server.server in servers[:2]) self.assertTrue(server.server in servers[:2])
def test_iter(self): def test_iter(self):
m = manager.Manager(['all']) with mock.patch.object(manager, 'find_executable', lambda x: x):
self.assertEqual(len(list(m)), len(manager.ALL_SERVERS)) m = manager.Manager(['all'])
for server in m: self.assertEqual(len(list(m)), len(manager.ALL_SERVERS))
self.assertTrue(server.server in manager.ALL_SERVERS) for server in m:
self.assertTrue(server.server in manager.ALL_SERVERS)
def test_default_strict(self): def test_default_strict(self):
# test default strict # test default strict
@ -2329,8 +2330,8 @@ class TestManager(unittest.TestCase):
return 0 return 0
m = manager.Manager(['*-server']) m = manager.Manager(['*-server'])
self.assertEqual(len(m.servers), 4)
expected_servers = set([server.server for server in m.servers]) expected_servers = set([server.server for server in m.servers])
self.assertEqual(len(expected_servers), 4)
for server in expected_servers: for server in expected_servers:
self.assertIn(server, manager.GRACEFUL_SHUTDOWN_SERVERS) self.assertIn(server, manager.GRACEFUL_SHUTDOWN_SERVERS)
@ -2347,8 +2348,9 @@ class TestManager(unittest.TestCase):
actual_servers.update([server.server for server in m.servers]) actual_servers.update([server.server for server in m.servers])
self.assertEqual(expected_servers, actual_servers) self.assertEqual(expected_servers, actual_servers)
do_test(graceful=True) with mock.patch.object(manager, 'find_executable', lambda x: x):
do_test(graceful=False) # graceful is forced regardless of the kwarg do_test(graceful=True)
do_test(graceful=False) # graceful is forced regardless
@mock.patch.object(manager, 'verify_server', @mock.patch.object(manager, 'verify_server',
side_effect=lambda server: 'error' not in server) side_effect=lambda server: 'error' not in server)