This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new 9671cd4 DISPATCH-2113: Removed all relative path references in system
tests. This closes #1210
9671cd4 is described below
commit 9671cd4e8dd3a7a974e75694c80364e1932380ad
Author: Ganesh Murthy <[email protected]>
AuthorDate: Tue May 11 12:39:59 2021 -0400
DISPATCH-2113: Removed all relative path references in system tests. This
closes #1210
---
tests/system_tests_bad_configuration.py | 8 +++--
tests/system_tests_policy.py | 2 +-
tests/system_tests_policy_oversize_compound.py | 38 ++++++++++++------------
tests/system_tests_protocol_settings.py | 27 +++++++----------
tests/system_tests_tcp_adaptor.py | 24 +++++++++------
tests/system_tests_topology_disposition.py.in | 41 +++++++++++++-------------
6 files changed, 71 insertions(+), 69 deletions(-)
diff --git a/tests/system_tests_bad_configuration.py
b/tests/system_tests_bad_configuration.py
index 85bdfdd..ba06922 100644
--- a/tests/system_tests_bad_configuration.py
+++ b/tests/system_tests_bad_configuration.py
@@ -109,7 +109,7 @@ class RouterTestBadConfiguration(TestCase):
then it stops scheduling new attempts.
:return:
"""
- with open('../setUpClass/test-router.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
expected_log_snip = "Connection to %s" %
self.unresolvable_host_name
errors_caught = [line for line in log_lines if expected_log_snip
in line and "failed" in line]
@@ -180,7 +180,8 @@ class RouterTestIdFailCtrlChar(TestCase):
"""
Writes illegal config, runs router, examines console output
"""
- conf_path = "../setUpClass/test-router-ctrl-char.conf"
+ parent_path = os.path.dirname(os.getcwd())
+ conf_path = os.path.join(parent_path,
"setUpClass/test-router-ctrl-char.conf")
with open(conf_path, 'w') as router_conf:
router_conf.write("router { \n")
router_conf.write(" id: abc\\bdef \n")
@@ -221,7 +222,8 @@ class RouterTestIdFailWhiteSpace(TestCase):
"""
Writes illegal config, runs router, examines console output
"""
- conf_path = "../setUpClass/test-router-whitespace.conf"
+ parent_path = os.path.dirname(os.getcwd())
+ conf_path = os.path.join(parent_path,
"setUpClass/test-router-whitespace.conf")
with open(conf_path, 'w') as router_conf:
router_conf.write("router { \n")
router_conf.write(" id: abc def \n")
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index d4e2afa..0db1ba5 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -341,7 +341,7 @@ class SenderReceiverLimits(TestCase):
# To accomodate the file lag this test may retry reading the log file.
verified = False
for tries in range(5):
- with open('../setUpClass/SenderReceiverLimits.log', 'r') as
router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
close_lines = [s for s in log_lines if "senders_denied=1,
receivers_denied=1" in s]
verified = len(close_lines) == 1
diff --git a/tests/system_tests_policy_oversize_compound.py
b/tests/system_tests_policy_oversize_compound.py
index 1ed68f1..9ef74c8 100644
--- a/tests/system_tests_policy_oversize_compound.py
+++ b/tests/system_tests_policy_oversize_compound.py
@@ -762,13 +762,13 @@ class MaxMessageSizeBlockOversize(TestCase):
raise Exception("%s\n%s" % (e, out))
return out
- def sense_n_closed_lines(self, routername,
pattern=OVERSIZE_CONDITION_NAME):
+ def sense_n_closed_lines(self, router, pattern=OVERSIZE_CONDITION_NAME):
"""
Read a router's log file and count how many size-exceeded lines are in
it.
:param routername:
:return: (int, int) tuple with counts of lines in and lines out
"""
- with open("../setUpClass/%s.log" % routername, 'r') as router_log:
+ with open(router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
i_closed_lines = [s for s in log_lines if pattern in s and "<-" in s]
o_closed_lines = [s for s in log_lines if pattern in s and "->" in s]
@@ -789,7 +789,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_60_block_oversize_EB1_INTB_at_INTB(self):
- ibefore, obefore = self.sense_n_closed_lines("EB1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EB1)
test = OversizeMessageTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.EB1,
MaxMessageSizeBlockOversize.INT_B,
@@ -803,7 +803,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("EB1")
+ iafter, oafter = self.sense_n_closed_lines(self.EB1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 0 and idelta == 1
@@ -814,7 +814,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(success, "Expected router to generate close with
condition: message size exceeded")
# Verfiy that a link was closed with the expected pattern(s)
- ilink1, olink1 = self.sense_n_closed_lines("EB1",
pattern=OVERSIZE_LINK_CONDITION_NAME)
+ ilink1, olink1 = self.sense_n_closed_lines(self.EB1,
pattern=OVERSIZE_LINK_CONDITION_NAME)
success = olink1 > 0
if (not success):
test.logger.log("FAIL: Did not see link close in log file.
oBefore: %d, oAfter: %d, iBefore:%d, iAfter:%d" %
@@ -837,7 +837,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_61_block_oversize_EB1_EA1_at_INTB(self):
- ibefore, obefore = self.sense_n_closed_lines("EB1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EB1)
test = OversizeMessageTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.EB1,
MaxMessageSizeBlockOversize.EA1,
@@ -851,7 +851,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("EB1")
+ iafter, oafter = self.sense_n_closed_lines(self.EB1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 0 and idelta == 1
@@ -876,7 +876,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_70_block_oversize_EB1_INTB_at_both(self):
- ibefore, obefore = self.sense_n_closed_lines("EB1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EB1)
test = OversizeMessageTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.EB1,
MaxMessageSizeBlockOversize.INT_B,
@@ -896,7 +896,7 @@ class MaxMessageSizeBlockOversize(TestCase):
# oversize condition before it has forwarded too many bytes of the
first message
# to INT.B. Then EB1 aborts the first message to INT.B and INT.B never
# detects an oversize condition.
- iafter, oafter = self.sense_n_closed_lines("EB1")
+ iafter, oafter = self.sense_n_closed_lines(self.EB1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 1 and (idelta == 0 or idelta == 1)
@@ -927,7 +927,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_80_block_multicast_EB1_INTB_at_INTB(self):
- ibefore, obefore = self.sense_n_closed_lines("EB1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EB1)
count = 10
test = OversizeMulticastTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.EB1,
@@ -946,7 +946,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("EB1")
+ iafter, oafter = self.sense_n_closed_lines(self.EB1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 0 and idelta == 1
@@ -977,7 +977,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_81_block_multicast_EA1(self):
- ibefore, obefore = self.sense_n_closed_lines("EA1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EA1)
count = 10
test = OversizeMulticastTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.EA1,
@@ -996,7 +996,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("EA1")
+ iafter, oafter = self.sense_n_closed_lines(self.EA1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 1 and idelta == 0
@@ -1027,7 +1027,7 @@ class MaxMessageSizeBlockOversize(TestCase):
#
def test_82_block_multicast_INTA(self):
- ibefore, obefore = self.sense_n_closed_lines("INT.A")
+ ibefore, obefore = self.sense_n_closed_lines(self.INT_A)
count = 10
test = OversizeMulticastTransferTest(MaxMessageSizeBlockOversize,
MaxMessageSizeBlockOversize.INT_A,
@@ -1046,7 +1046,7 @@ class MaxMessageSizeBlockOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("INT.A")
+ iafter, oafter = self.sense_n_closed_lines(self.INT_A)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 1 and idelta == 0
@@ -1213,13 +1213,13 @@ class MaxMessageSizeLinkRouteOversize(TestCase):
cls.EA1.wait_connectors()
cls.EB1.wait_connectors()
- def sense_n_closed_lines(self, routername):
+ def sense_n_closed_lines(self, router):
"""
Read a router's log file and count how many size-exceeded lines are in
it.
:param routername:
:return: (int, int) tuple with counts of lines in and lines out
"""
- with open("../setUpClass/%s.log" % routername, 'r') as router_log:
+ with open(router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
i_closed_lines = [s for s in log_lines if OVERSIZE_CONDITION_NAME in s
and "<-" in s]
o_closed_lines = [s for s in log_lines if OVERSIZE_CONDITION_NAME in s
and "->" in s]
@@ -1240,7 +1240,7 @@ class MaxMessageSizeLinkRouteOversize(TestCase):
#
def test_90_block_link_route_EB1_INTB(self):
- ibefore, obefore = self.sense_n_closed_lines("EB1")
+ ibefore, obefore = self.sense_n_closed_lines(self.EB1)
test = OversizeMessageTransferTest(MaxMessageSizeLinkRouteOversize,
MaxMessageSizeLinkRouteOversize.EB1,
None,
@@ -1255,7 +1255,7 @@ class MaxMessageSizeLinkRouteOversize(TestCase):
self.assertTrue(test.error is None)
# Verify that interrouter link was shut down
- iafter, oafter = self.sense_n_closed_lines("EB1")
+ iafter, oafter = self.sense_n_closed_lines(self.EB1)
idelta = iafter - ibefore
odelta = oafter - obefore
success = odelta == 1 and (idelta == 0 or idelta == 1)
diff --git a/tests/system_tests_protocol_settings.py
b/tests/system_tests_protocol_settings.py
index 8466d52..c3f1010 100644
--- a/tests/system_tests_protocol_settings.py
+++ b/tests/system_tests_protocol_settings.py
@@ -23,6 +23,7 @@ from __future__ import absolute_import
from __future__ import print_function
import sys
+import os
from system_test import TestCase, Qdrouterd, main_module
from system_test import unittest
from proton.utils import BlockingConnection
@@ -50,7 +51,7 @@ class MaxFrameMaxSessionFramesTest(TestCase):
bc.create_receiver("xxx")
bc.close()
- with open('../setUpClass/MaxFrameMaxSessionFrames.log', 'r') as
router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# max-frame is from the config
@@ -83,8 +84,7 @@ class MaxSessionsTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxSessions.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 9
@@ -112,8 +112,7 @@ class MaxSessionsZeroTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxSessionsZero.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 0. Should get proton default 32767
@@ -141,8 +140,7 @@ class MaxSessionsLargeTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxSessionsLarge.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 0. Should get proton default 32767
@@ -170,8 +168,7 @@ class MaxFrameSmallTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxFrameSmall.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size <= 512 proton set min of 512
@@ -199,8 +196,7 @@ class MaxFrameDefaultTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxFrameDefault.log', 'r') as router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size not set then a default is used
@@ -228,8 +224,7 @@ class MaxSessionFramesDefaultTest(TestCase):
bc = BlockingConnection(self.router.addresses[0])
bc.create_receiver("xxx")
bc.close()
-
- with open('../setUpClass/MaxSessionFramesDefault.log', 'r') as
router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size not set then a default is used
@@ -270,7 +265,7 @@ class MaxFrameMaxSessionFramesZeroTest(TestCase):
bc.create_receiver("xxx")
bc.close()
- with open('../setUpClass/MaxFrameMaxSessionFramesZero.log', 'r') as
router_log:
+ with open(self.router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# max-frame gets set to protocol min
@@ -326,7 +321,7 @@ class ConnectorSettingsDefaultTest(TestCase):
cls.routers[1].wait_router_connected('QDR.A')
def test_connector_default(self):
- with open('../setUpClass/A.log', 'r') as router_log:
+ with open(self.routers[0].logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "<- @open" in s]
# defaults
@@ -384,7 +379,7 @@ class ConnectorSettingsNondefaultTest(TestCase):
cls.routers[1].wait_router_connected('QDR.A')
def test_connector_default(self):
- with open('../setUpClass/A.log', 'r') as router_log:
+ with open(self.routers[0].logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "<- @open" in s]
# nondefaults
diff --git a/tests/system_tests_tcp_adaptor.py
b/tests/system_tests_tcp_adaptor.py
index b2f1aad..f60de91 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -137,10 +137,12 @@ class EchoClientRunner():
self.name = "%s_%s_%s_%s" % \
(self.test_name, self.client_n, self.size, self.count)
self.client_prefix = "ECHO_CLIENT %s" % self.name
+
+ parent_path = os.path.dirname(os.getcwd())
self.client_logger = Logger(title=self.client_prefix,
print_to_console=self.print_client_logs,
save_for_dump=False,
-
ofilename="../setUpClass/TcpAdaptor_echo_client_%s.log" % self.name)
+ ofilename=os.path.join(parent_path,
"setUpClass/TcpAdaptor_echo_client_%s.log" % self.name))
try:
self.e_client = TcpEchoClient(prefix=self.client_prefix,
@@ -311,10 +313,11 @@ class TcpAdaptor(TestCase):
# define logging levels
cls.print_logs_server = False
cls.print_logs_client = True
+ parent_path = os.path.dirname(os.getcwd())
cls.logger = Logger(title="TcpAdaptor-testClass",
print_to_console=True,
save_for_dump=False,
- ofilename='../setUpClass/TcpAdaptor.log')
+ ofilename=os.path.join(parent_path,
"setUpClass/TcpAdaptor.log"))
# Write a dummy log line for scraper.
cls.logger.log("SERVER (info) Container Name: TCP_TEST")
@@ -324,13 +327,14 @@ class TcpAdaptor(TestCase):
# start echo servers immediately after the echo server
# ports are assigned.
+ parent_path = os.path.dirname(os.getcwd())
for rtr in cls.router_order:
test_name = "TcpAdaptor"
server_prefix = "ECHO_SERVER %s ES_%s" % (test_name, rtr)
server_logger = Logger(title=test_name,
print_to_console=cls.print_logs_server,
save_for_dump=False,
-
ofilename="../setUpClass/TcpAdaptor_echo_server_%s.log" % rtr)
+ ofilename=os.path.join(parent_path,
"setUpClass/TcpAdaptor_echo_server_%s.log" % rtr))
cls.logger.log("TCP_TEST Launching echo server '%s'" %
server_prefix)
server = TcpEchoServer(prefix=server_prefix,
port=cls.tcp_server_listener_ports[rtr],
@@ -344,7 +348,7 @@ class TcpAdaptor(TestCase):
server_logger = Logger(title="TcpAdaptor",
print_to_console=cls.print_logs_server,
save_for_dump=False,
-
ofilename="../setUpClass/TcpAdaptor_echo_server_NS_CONN_STALL.log")
+ ofilename=os.path.join(parent_path,
"setUpClass/TcpAdaptor_echo_server_NS_CONN_STALL.log"))
cls.logger.log("TCP_TEST Launching echo server '%s'" % server_prefix)
server = TcpEchoServer(prefix=server_prefix,
port=cls.EC2_conn_stall_connector_port,
@@ -460,13 +464,15 @@ class TcpAdaptor(TestCase):
cls.logger.log("TCP_TEST %s" % line)
# write to shell script
- with open("../setUpClass/TcpAdaptor-ports.sh", 'w') as o_file:
+ parent_path = os.path.dirname(os.getcwd())
+ file_name = os.path.join(parent_path, "setUpClass/TcpAdaptor-ports.sh")
+ with open(file_name, 'w') as o_file:
for line in p_out:
o_file.write("set %s\n" % line)
# Write a script to run scraper on this test's log files
scraper_abspath = os.path.join(os.environ.get('BUILD_DIR'), 'tests',
'scraper', 'scraper.py')
- logs_dir = os.path.abspath("../setUpClass")
+ logs_dir = os.path.join(parent_path, "setUpClass")
main_log = "TcpAdaptor.log"
echo_logs = "TcpAdaptor_echo*"
big_test_log = "TcpAdaptor_all.log"
@@ -474,8 +480,7 @@ class TcpAdaptor(TestCase):
edge_logs = "E*.log"
log_modules_spec = "--log-modules
TCP_ADAPTOR,TCP_TEST,ECHO_SERVER,ECHO_CLIENT"
html_output = "TcpAdaptor.html"
-
- with open("../setUpClass/TcpAdaptor-run-scraper.sh", 'w') as o_file:
+ with open(os.path.join(parent_path,
"setUpClass/TcpAdaptor-run-scraper.sh"), 'w') as o_file:
o_file.write("#!/bin/bash\n\n")
o_file.write("# Script to run scraper on test class TcpAdaptor
test result\n")
o_file.write("# cd into logs directory\n")
@@ -905,10 +910,11 @@ class TcpAdaptorManagementTest(TestCase):
# Start the echo server. This is the server that the tcpConnector
# will be connecting to.
server_prefix = "ECHO_SERVER ES_%s" % cls.test_name
+ parent_path = os.path.dirname(os.getcwd())
cls.logger = Logger(title="TcpAdaptor",
print_to_console=True,
save_for_dump=False,
-
ofilename="../setUpClass/TcpAdaptor_echo_server.log")
+ ofilename=os.path.join(parent_path,
"setUpClass/TcpAdaptor_echo_server.log"))
cls.echo_server = TcpEchoServer(prefix=server_prefix,
port=cls.tcp_server_port,
logger=cls.logger)
diff --git a/tests/system_tests_topology_disposition.py.in
b/tests/system_tests_topology_disposition.py.in
index d3b2a09..1e9798d 100644
--- a/tests/system_tests_topology_disposition.py.in
+++ b/tests/system_tests_topology_disposition.py.in
@@ -332,20 +332,20 @@ class TopologyDispositionTests (TestCase):
]
)
- router_A = cls.routers[0]
- router_B = cls.routers[1]
- router_C = cls.routers[2]
- router_D = cls.routers[3]
+ cls.router_A = cls.routers[0]
+ cls.router_B = cls.routers[1]
+ cls.router_C = cls.routers[2]
+ cls.router_D = cls.routers[3]
- router_A.wait_router_connected('B')
- router_A.wait_router_connected('C')
- router_A.wait_router_connected('D')
+ cls.router_A.wait_router_connected('B')
+ cls.router_A.wait_router_connected('C')
+ cls.router_A.wait_router_connected('D')
cls.client_addrs = dict()
- cls.client_addrs['A'] = router_A.addresses[0]
- cls.client_addrs['B'] = router_B.addresses[0]
- cls.client_addrs['C'] = router_C.addresses[0]
- cls.client_addrs['D'] = router_D.addresses[0]
+ cls.client_addrs['A'] = cls.router_A.addresses[0]
+ cls.client_addrs['B'] = cls.router_B.addresses[0]
+ cls.client_addrs['C'] = cls.router_C.addresses[0]
+ cls.client_addrs['D'] = cls.router_D.addresses[0]
# 1 means skip that test.
cls.skip = {'test_01' : 0,
@@ -384,30 +384,29 @@ class TopologyDispositionTests (TestCase):
self.skipTest("Test skipped during development.")
st_key = "PROTOCOL (trace) [C"
qc_key = "qd.conn-id\"="
- for letter in ['A', 'B', 'C', 'D']:
- log_name = ('../setUpClass/%s.log' % letter)
- with open(log_name, 'r') as router_log:
+ for router in [self.router_A, self.router_B, self.router_C,
self.router_D]:
+ with open(router.logfile_path, 'r') as router_log:
log_lines = router_log.read().split("\n")
outbound_opens = [s for s in log_lines if "-> @open" in s]
for oopen in outbound_opens:
sti = oopen.find(st_key)
if sti < 0:
- error = "Log %s, line '%s' has no SERVER key" %
(log_name, oopen)
+ error = "Log %s, line '%s' has no SERVER key" %
(router.logfile_path, oopen)
break
qci = oopen.find(qc_key)
if qci < 0:
- error = "Log %s, line '%s' has no qd.conn-id key" %
(log_name, oopen)
+ error = "Log %s, line '%s' has no qd.conn-id key" %
(router.logfile_path, oopen)
break
sti += len(st_key)
qci += len(qc_key)
while not oopen[sti] == "]":
if not oopen[sti] == oopen[qci]:
- error = "log %s, line '%s' server conn_id !=
published conn-id" % (log_name, oopen)
+ error = "log %s, line '%s' server conn_id !=
published conn-id" % (router.logfile_path, oopen)
break
sti += 1
qci += 1
if error is None and oopen[qci].isdigit():
- error = "log %s, line '%s' published conn-id is too
big" % (log_name, oopen)
+ error = "log %s, line '%s' published conn-id is too
big" % (router.logfile_path, oopen)
self.assertIsNone(error)
self.assertIsNone(error)
@@ -421,8 +420,8 @@ class TopologyDispositionTests (TestCase):
# aggregate all the log files
files = []
- for letter in ['A', 'B', 'C', 'D']:
- files.append('../setUpClass/%s.log' % letter)
+ for router in [self.router_A, self.router_B, self.router_C,
self.router_D]:
+ files.append(router.logfile_path)
p = self.popen(['/usr/bin/env', '${PY_STRING}', scraper_path, '-f'] +
files,
stdin=PIPE, stdout=PIPE, stderr=STDOUT,
universal_newlines=True)
@@ -439,7 +438,7 @@ class TopologyDispositionTests (TestCase):
self.assertIn('</body>', out)
# split A.log
- p = self.popen(['/usr/bin/env', '${PY_STRING}', scraper_path,
'--split', '-f', '../setUpClass/A.log'],
+ p = self.popen(['/usr/bin/env', '${PY_STRING}', scraper_path,
'--split', '-f', self.router_A.logfile_path],
stdin=PIPE, stdout=PIPE, stderr=STDOUT,
universal_newlines=True)
out = p.communicate(None)[0]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
