You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2018/04/25 21:03:38 UTC
qpid-dispatch git commit: NO-JIRA - Added a link-name generator for
the distribution system test.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master c6f08def6 -> e5398cce6
NO-JIRA - Added a link-name generator for the distribution system test.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/e5398cce
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/e5398cce
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/e5398cce
Branch: refs/heads/master
Commit: e5398cce6baedefa97e7ed2e697249bc74fae8ed
Parents: c6f08de
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Apr 25 17:03:05 2018 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Apr 25 17:03:05 2018 -0400
----------------------------------------------------------------------
tests/system_tests_distribution.py | 46 +++++++++++++++++++--------------
1 file changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e5398cce/tests/system_tests_distribution.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_distribution.py b/tests/system_tests_distribution.py
index 4e3a736..27f1a23 100644
--- a/tests/system_tests_distribution.py
+++ b/tests/system_tests_distribution.py
@@ -1723,6 +1723,13 @@ class DistributionTests ( TestCase ):
# Tests
#================================================================
+next_link_sequence = 1
+def link_name():
+ global next_link_sequence
+ name = "link-name.%d" % next_link_sequence
+ next_link_sequence += 1
+ return name
+
class TargetedSenderTest ( MessagingHandler ):
"""
A 'targeted' sender is one in which we tell the router what
@@ -2321,14 +2328,14 @@ class ClosestTest ( MessagingHandler ):
# explicit distinct names, or we will in fact only get
# one link. And then wonder why receiver 2 on each
# router isn't getting any messages.
- self.recv_1_a = event.container.create_receiver ( self.cnx_1, self.dest, name="1" )
- self.recv_1_b = event.container.create_receiver ( self.cnx_1, self.dest, name="2" )
+ self.recv_1_a = event.container.create_receiver ( self.cnx_1, self.dest, name=link_name() )
+ self.recv_1_b = event.container.create_receiver ( self.cnx_1, self.dest, name=link_name() )
- self.recv_2_a = event.container.create_receiver ( self.cnx_2, self.dest, name="1" )
- self.recv_2_b = event.container.create_receiver ( self.cnx_2, self.dest, name="2" )
+ self.recv_2_a = event.container.create_receiver ( self.cnx_2, self.dest, name=link_name() )
+ self.recv_2_b = event.container.create_receiver ( self.cnx_2, self.dest, name=link_name() )
- self.recv_3_a = event.container.create_receiver ( self.cnx_3, self.dest, name="1" )
- self.recv_3_b = event.container.create_receiver ( self.cnx_3, self.dest, name="2" )
+ self.recv_3_a = event.container.create_receiver ( self.cnx_3, self.dest, name=link_name() )
+ self.recv_3_b = event.container.create_receiver ( self.cnx_3, self.dest, name=link_name() )
self.recv_1_a.flow ( self.n_expected )
self.recv_2_a.flow ( self.n_expected )
@@ -2697,14 +2704,14 @@ class MulticastTest ( MessagingHandler ):
# explicit distinct names, or we will in fact only get
# one link. And then wonder why receiver 2 on each
# router isn't getting any messages.
- self.recv_1_a = event.container.create_receiver ( self.cnx_1, self.dest, name="1" )
- self.recv_1_b = event.container.create_receiver ( self.cnx_1, self.dest, name="2" )
+ self.recv_1_a = event.container.create_receiver ( self.cnx_1, self.dest, name=link_name() )
+ self.recv_1_b = event.container.create_receiver ( self.cnx_1, self.dest, name=link_name() )
- self.recv_2_a = event.container.create_receiver ( self.cnx_2, self.dest, name="1" )
- self.recv_2_b = event.container.create_receiver ( self.cnx_2, self.dest, name="2" )
+ self.recv_2_a = event.container.create_receiver ( self.cnx_2, self.dest, name=link_name() )
+ self.recv_2_b = event.container.create_receiver ( self.cnx_2, self.dest, name=link_name() )
- self.recv_3_a = event.container.create_receiver ( self.cnx_3, self.dest, name="1" )
- self.recv_3_b = event.container.create_receiver ( self.cnx_3, self.dest, name="2" )
+ self.recv_3_a = event.container.create_receiver ( self.cnx_3, self.dest, name=link_name() )
+ self.recv_3_b = event.container.create_receiver ( self.cnx_3, self.dest, name=link_name() )
self.recv_1_a.flow ( self.n_to_send )
self.recv_2_a.flow ( self.n_to_send )
@@ -3251,10 +3258,9 @@ class RoutingTest ( MessagingHandler ):
def make_senders ( self, n ):
self.debug_print ( "making %d senders" % n )
for i in xrange(n):
- sender_name = "sender_A_%d" % len ( self.my_senders )
sender = self.sender_container.create_sender ( self.sender_cnx,
self.link_routable_address,
- name=sender_name
+ name=link_name()
)
self.my_senders.append ( sender )
@@ -3471,13 +3477,13 @@ class WaypointTest ( MessagingHandler ):
sender['sender'] = event.container.create_sender ( self.client_connection,
self.destination,
- name="sender_%d" % i)
+ name=link_name() )
sender['to_send'] = self.messages_per_sender
sender['n_sent'] = 0
receiver['receiver'] = event.container.create_receiver ( self.client_connection,
self.destination,
- name="receiver_%d" % i)
+ name=link_name() )
receiver['n_received'] = 0
@@ -3709,13 +3715,13 @@ class SerialWaypointTest ( MessagingHandler ):
sender['sender'] = event.container.create_sender ( cnx,
self.destination,
- name="sender_%d" % i)
+ name=link_name() )
sender['to_send'] = self.messages_per_sender
sender['n_sent'] = 0
receiver['receiver'] = event.container.create_receiver ( cnx,
self.destination,
- name="receiver_%d" % i)
+ name=link_name() )
receiver['n_received'] = 0
@@ -4024,12 +4030,12 @@ class ParallelWaypointTest ( MessagingHandler ):
sender['sender'] = event.container.create_sender ( cnx,
self.destination,
- name="sender_%d" % i)
+ name=link_name() )
sender['to_send'] = self.messages_per_sender
sender['n_sent'] = 0
receiver['receiver'] = event.container.create_receiver ( cnx,
self.destination,
- name="receiver_%d" % i)
+ name=link_name() )
receiver['n_received'] = 0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org