diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 15:31:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 15:31:58 +0000 |
| commit | 294f17507c0ef4b7f99c5284bd07a14c90e3063a (patch) | |
| tree | 4c8e25334cb3384b401c24a527597d395a6b4aea | |
| parent | 626c27def5fa630a4dd97898ed2036658bb49cf2 (diff) | |
| parent | 7b841040c99c626023538d75f1febe19233ed7ba (diff) | |
| download | oslo-messaging-294f17507c0ef4b7f99c5284bd07a14c90e3063a.tar.gz | |
Merge "[zmq] Fix zmq-specific f-tests from periodic hangs"
| -rw-r--r-- | oslo_messaging/tests/functional/zmq/test_startup.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/oslo_messaging/tests/functional/zmq/test_startup.py b/oslo_messaging/tests/functional/zmq/test_startup.py index 1b23b5c..1351f78 100644 --- a/oslo_messaging/tests/functional/zmq/test_startup.py +++ b/oslo_messaging/tests/functional/zmq/test_startup.py @@ -33,18 +33,16 @@ class StartupOrderTestCase(multiproc_utils.MultiprocTestCase): sys.stdout = open(log_path, "w", buffering=0) def test_call_client_wait_for_server(self): - self.spawn_servers(3, wait_for_server=True, common_topic=True) - servers = self.spawned - client = self.get_client(servers[0].topic) + server = self.spawn_server(wait_for_server=True) + client = self.get_client(server.topic) for _ in range(3): reply = client.call_a() self.assertIsNotNone(reply) self.assertEqual(3, len(client.replies)) def test_call_client_dont_wait_for_server(self): - self.spawn_servers(3, wait_for_server=False, common_topic=True) - servers = self.spawned - client = self.get_client(servers[0].topic) + server = self.spawn_server(wait_for_server=False) + client = self.get_client(server.topic) for _ in range(3): reply = client.call_a() self.assertIsNotNone(reply) |