[qpid-dispatch] branch master updated: DISPATCH-1882: TCP test handles empty echo servers dictionary

[chug]

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

chug 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 f632206  DISPATCH-1882: TCP test handles empty echo servers dictionary
f632206 is described below

commit f6322060d6677415b693ba24b337cfd75cf419c7
Author: Chuck Rolke <c...@apache.org>
AuthorDate: Mon Dec 14 09:54:59 2020 -0500

    DISPATCH-1882: TCP test handles empty echo servers dictionary
---
 tests/system_tests_tcp_adaptor.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/system_tests_tcp_adaptor.py 
b/tests/system_tests_tcp_adaptor.py
index e73ec9a..236f4c5 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -167,6 +167,9 @@ class TcpAdaptor(TestCase):
     # TCP siteId for listeners and connectors
     site = "mySite"
 
+    # Each router has an echo server to which it connects
+    echo_servers = {}
+
     @classmethod
     def setUpClass(cls):
         """Start a router"""
@@ -361,7 +364,6 @@ class TcpAdaptor(TestCase):
         cls.print_logs_client = True
 
         # start echo servers
-        cls.echo_servers = {}
         for rtr in cls.router_order:
             test_name = "TcpAdaptor"
             server_prefix = "ECHO_SERVER %s ES_%s" % (test_name, rtr)
@@ -407,9 +409,10 @@ class TcpAdaptor(TestCase):
     def tearDownClass(cls):
         # stop echo servers
         for rtr in cls.router_order:
-            server = cls.echo_servers[rtr]
-            cls.logger.log("TCP_TEST Stopping echo server %s" % rtr)
-            server.wait()
+            server = cls.echo_servers.get(rtr)
+            if not server is None:
+                cls.logger.log("TCP_TEST Stopping echo server %s" % rtr)
+                server.wait()
         super(TcpAdaptor, cls).tearDownClass()
 
     #


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