You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/04/29 21:38:56 UTC
[09/13] qpid-proton git commit: NO-JIRA: fix SelectableMessengerTest
on Mac
NO-JIRA: fix SelectableMessengerTest on Mac
The SelectableMessengerTest was failing intermittently on Mac builds,
Modify the test slightly to be more resilient.
Closes #23
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/dd95103e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/dd95103e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/dd95103e
Branch: refs/heads/kgiusti-python3
Commit: dd95103e510df31796482ea490f603c65e1a495f
Parents: a509195
Author: Dominic Evans <do...@uk.ibm.com>
Authored: Tue Apr 28 16:11:30 2015 +0100
Committer: Dominic Evans <do...@uk.ibm.com>
Committed: Tue Apr 28 16:14:26 2015 +0100
----------------------------------------------------------------------
tests/python/proton_tests/messenger.py | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/dd95103e/tests/python/proton_tests/messenger.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/messenger.py b/tests/python/proton_tests/messenger.py
index 94e4e0d..23004ba 100644
--- a/tests/python/proton_tests/messenger.py
+++ b/tests/python/proton_tests/messenger.py
@@ -1012,17 +1012,21 @@ class SelectableMessengerTest(common.Test):
mc = Message()
- for i in range(count):
- while mrcv.incoming == 0:
- p.pump()
- assert mrcv.incoming > 0, (count, msnd.outgoing, mrcv.incoming)
- mrcv.get(mc)
- assert mc.body == u"Hello World! %s" % i, (i, mc.body)
-
- mrcv.stop()
- assert not mrcv.stopped
- p.pump()
- assert mrcv.stopped
+ try:
+ for i in range(count):
+ while mrcv.incoming == 0:
+ p.pump()
+ assert mrcv.incoming > 0, (count, msnd.outgoing, mrcv.incoming)
+ mrcv.get(mc)
+ assert mc.body == u"Hello World! %s" % i, (i, mc.body)
+ finally:
+ mrcv.stop()
+ msnd.stop()
+ assert not mrcv.stopped
+ assert not msnd.stopped
+ p.pump()
+ assert mrcv.stopped
+ assert msnd.stopped
def testSelectable16(self):
self.testSelectable(count=16)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org