From 9d6a4a6f100eb70ebc44bbd6ae626b0fc86c547a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 7 Dec 2012 18:09:26 +0000 Subject: NO-JIRA: Fix race condition in brokertest.py test harness. Fixed a race conndition that was causing false failures of the form "expected an error". git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1418417 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/brokertest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 0597a933a3..24f4bcadf9 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -203,7 +203,9 @@ class Popen(subprocess.Popen): self.wait() def kill(self): - self.expect = EXPECT_EXIT_FAIL + # Set to EXPECT_UNKNOWN, EXPECT_EXIT_FAIL creates a race condition + # if the process exits normally concurrent with the call to kill. + self.expect = EXPECT_UNKNOWN try: subprocess.Popen.kill(self) except AttributeError: # No terminate method try: -- cgit v1.2.1