[qpid-dispatch] branch master updated: DISPATCH-1413: re-fix the test_10_propagated_disposition in system_tests_two_routers

[kg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kgiusti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new d0e391c  DISPATCH-1413: re-fix the test_10_propagated_disposition in system_tests_two_routers
d0e391c is described below

commit d0e391ce53e036156197d0a7c3ebab33aac7b5e8
Author: Kenneth Giusti <kg...@redhat.com>
AuthorDate: Wed Sep 11 16:15:01 2019 -0400

    DISPATCH-1413: re-fix the test_10_propagated_disposition in system_tests_two_routers
---
 tests/system_tests_two_routers.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index 3dd7ea7..42c0fb8 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -1444,27 +1444,23 @@ class PropagatedDisposition(MessagingHandler):
         self.receiver = event.container.create_receiver(self.receiver_conn, addr)
         self.receiver.flow(2)
         self.trackers = {}
+        for b in ['accept', 'reject']:
+            self.trackers[self.sender.send(Message(body=b))] = b
 
     def timeout(self):
-        unique_list = list(dict.fromkeys(self.settled))
-        self.error = "Timeout Expired: Expected ['accept', 'reject'] got " + unique_list
+        unique_list = sorted(list(dict.fromkeys(self.settled)))
+        self.error = "Timeout Expired: Expected ['accept', 'reject'] got %s" % unique_list
         self.sender_conn.close()
         self.receiver_conn.close()
 
     def check(self):
-        unique_list = list(dict.fromkeys(self.settled))
+        unique_list = sorted(list(dict.fromkeys(self.settled)))
         if unique_list == [u'accept', u'reject']:
             self.passed = True
             self.sender_conn.close()
             self.receiver_conn.close()
             self.timer.cancel()
 
-    def on_sendable(self, event):
-        if self.sender == event.sender:
-            for b in ['accept', 'reject']:
-                msg = Message(body=b)
-                self.trackers[self.sender.send(msg)] = b
-
     def on_message(self, event):
         if event.message.body == u'accept':
             event.delivery.update(Delivery.ACCEPTED)


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