diff options
| author | Alan Conway <aconway@apache.org> | 2012-12-07 18:09:26 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-12-07 18:09:26 +0000 |
| commit | 9d6a4a6f100eb70ebc44bbd6ae626b0fc86c547a (patch) | |
| tree | 78f9d6192d91480de58e20fe9195ab94e2b8960c /qpid/cpp/src/tests | |
| parent | 5bb52a43c6f8765c08dfdfc556766b0d3aed8929 (diff) | |
| download | qpid-python-9d6a4a6f100eb70ebc44bbd6ae626b0fc86c547a.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |