qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [5/7] qpid-proton git commit: further refined the assert statement
Date Tue, 28 Apr 2015 16:14:24 GMT
further refined the assert statement

(cherry picked from commit 2d899d1f5b3eac660f7a5fb647aeaeec68347fa2)


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f0665a05
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f0665a05
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f0665a05

Branch: refs/heads/0.9.x
Commit: f0665a057c6f47525af7b58cde978d2eb2dc09fa
Parents: 82e4ded
Author: Rafael Schloming <rhs@alum.mit.edu>
Authored: Tue Apr 28 10:44:04 2015 -0400
Committer: Dominic Evans <dominic.evans@uk.ibm.com>
Committed: Tue Apr 28 17:09:42 2015 +0100

----------------------------------------------------------------------
 tests/python/proton_tests/messenger.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f0665a05/tests/python/proton_tests/messenger.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/messenger.py b/tests/python/proton_tests/messenger.py
index 172e38c..0fc9fec 100644
--- a/tests/python/proton_tests/messenger.py
+++ b/tests/python/proton_tests/messenger.py
@@ -1016,8 +1016,11 @@ class SelectableMessengerTest(common.Test):
       before = msnd.outgoing
       if mrcv.incoming == 0:
         p.pump()
-      # if we didn't receive the messages, they should be "in flight"
-      if mrcv.incoming == 0:
+      # If we didn't receive the messages, check that they are
+      # in-flight. We can only check this after the first message
+      # arrives since sasl handshaking might require multiple pumps
+      # prior to the first message arrival.
+      if i > 0 and mrcv.incoming == 0:
         assert msnd.outgoing < before
       # now pump until they arrive
       while mrcv.incoming == 0:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message