You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2020/12/17 20:17:17 UTC

[qpid-dispatch] branch master updated: DISPATCH-1895: Modify tcp self test not to use http listeners

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 276514d  DISPATCH-1895: Modify tcp self test not to use http listeners
276514d is described below

commit 276514d3755aa075bdb04d8b1599c2f859073dd5
Author: Chuck Rolke <ch...@apache.org>
AuthorDate: Thu Dec 17 15:08:44 2020 -0500

    DISPATCH-1895: Modify tcp self test not to use http listeners
    
    As noted in jira comment, the test failure is the http-libwebsockets
    code doing a wild 64-bit realloc. The failure has nothing to do with
    the tcp test itself and should be directed to a new jira blaming
    the libwebsockets code.
    
    That said, the tcp test is using http listeners purely for easier
    test debugging. The http listeners may be removed with no loss of
    test functionality and that is what this patch does.
---
 tests/system_tests_tcp_adaptor.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system_tests_tcp_adaptor.py b/tests/system_tests_tcp_adaptor.py
index 236f4c5..301b1bc 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -159,7 +159,7 @@ class TcpAdaptor(TestCase):
     nodest_listener_ports = {}
 
     # Each router has a console listener
-    http_listener_ports = {}
+    #http_listener_ports = {}
 
     # local timeout in seconds to wait for one echo client to finish
     echo_timeout = 30
@@ -183,7 +183,7 @@ class TcpAdaptor(TestCase):
             Launch a router through the system_test framework.
             For each router:
              * normal listener first
-             * http listener for console connections
+             #* http listener for console connections
              * tcp listener for 'nodest', which will never exist
              * tcp connector to echo server whose address is the same as this router's name
              * six tcp listeners, one for each server on each router on the network
@@ -196,7 +196,7 @@ class TcpAdaptor(TestCase):
             config = [
                 ('router', {'mode': mode, 'id': name}),
                 ('listener', {'port': cls.amqp_listener_ports[name]}),
-                ('listener', {'port': cls.http_listener_ports[name], 'http': 'yes'}),
+                #('listener', {'port': cls.http_listener_ports[name], 'http': 'yes'}),
                 ('tcpListener', {'host': "0.0.0.0",
                                  'port': cls.nodest_listener_ports[name],
                                  'address': 'nodest',
@@ -235,7 +235,7 @@ class TcpAdaptor(TestCase):
                 tl_ports[tcp_listener] = cls.tester.get_port()
             cls.tcp_client_listener_ports[rtr] = tl_ports
             cls.nodest_listener_ports[rtr] = cls.tester.get_port()
-            cls.http_listener_ports[rtr] = cls.tester.get_port()
+            #cls.http_listener_ports[rtr] = cls.tester.get_port()
 
         inter_router_port_AB  = cls.tester.get_port()
         inter_router_port_BC  = cls.tester.get_port()
@@ -263,8 +263,8 @@ class TcpAdaptor(TestCase):
                              (rtr, tcp_listener, cls.tcp_client_listener_ports[rtr][tcp_listener]))
             p_out.append("%s_nodest_listener=%d" %
                          (rtr, cls.nodest_listener_ports[rtr]))
-            p_out.append("%s_http_listener=%d" %
-                         (rtr, cls.http_listener_ports[rtr]))
+            #p_out.append("%s_http_listener=%d" %
+            #             (rtr, cls.http_listener_ports[rtr]))
         p_out.append("inter_router_port_AB=%d" % inter_router_port_AB)
         p_out.append("inter_router_port_BC=%d" % inter_router_port_BC)
         p_out.append("INTA_edge_port=%d" % cls.INTA_edge_port)


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