From 7b841040c99c626023538d75f1febe19233ed7ba Mon Sep 17 00:00:00 2001
From: Gevorg Davoian <gdavoian@mirantis.com>
Date: Fri, 25 Nov 2016 17:05:13 +0200
Subject: [PATCH] [zmq] Fix zmq-specific f-tests from periodic hangs
Change-Id: Ie7f7b5a61229db80194a26bc0cefa45e2a7614a9
---
oslo_messaging/tests/functional/zmq/test_startup.py | 10 ++++------
1 file 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 1b23b5cb9..1351f7890 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)