openstack/swift
Code Issues Proposed changes

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

Browse Source 
Change-Id: I9a1ebec645ced755aece8e28452f51488c2b776c
Related-Change: I09143ae20bd6249083c0b80cdaa9d561e6abb301
This commit is contained in:
Tim Burke 2021-03-18 16:35:05 -07:00
parent ec37893b82
commit d54083771f
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])
def test_iter(self):
m = manager.Manager(['all'])
self.assertEqual(len(list(m)), len(manager.ALL_SERVERS))
for server in m:
self.assertTrue(server.server in manager.ALL_SERVERS)
with mock.patch.object(manager, 'find_executable', lambda x: x):
m = manager.Manager(['all'])
self.assertEqual(len(list(m)), len(manager.ALL_SERVERS))
for server in m:
self.assertTrue(server.server in manager.ALL_SERVERS)
def test_default_strict(self):
# test default strict
@ -2329,8 +2330,8 @@ class TestManager(unittest.TestCase):
return 0
m = manager.Manager(['*-server'])
self.assertEqual(len(m.servers), 4)
expected_servers = set([server.server for server in m.servers])
self.assertEqual(len(expected_servers), 4)
for server in expected_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])
self.assertEqual(expected_servers, actual_servers)
do_test(graceful=True)
do_test(graceful=False) # graceful is forced regardless of the kwarg
with mock.patch.object(manager, 'find_executable', lambda x: x):
do_test(graceful=True)
do_test(graceful=False) # graceful is forced regardless
@mock.patch.object(manager, 'verify_server',
side_effect=lambda server: 'error' not in server)