From 09d7f6de8cd16f4c1509a73dd776334ec46677f1 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 2 Apr 2020 14:43:40 +0200 Subject: [PATCH] test_flows.py: remove rootdir and installdir from TestFlows installdir is no longer used. rootdir is only used for the tcpdump path. Move that use to the main function. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- tests/test_flows.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_flows.py b/tests/test_flows.py index 9b0fa2c10c..d8414cbd63 100755 --- a/tests/test_flows.py +++ b/tests/test_flows.py @@ -21,9 +21,6 @@ class TestFlows: def __init__(self): self.tests = [attr[len('test_'):] for attr in dir(self) if attr.startswith('test_')] - - self.rootdir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..')) - self.installdir = os.path.join(self.rootdir, 'build', 'install') self.running = '' def __fail_no_message(self) -> bool: @@ -681,7 +678,8 @@ def test_topology(self): opts.verbose = options.verbose opts.tcpdump = options.tcpdump - opts.tcpdump_dir = os.path.join(t.rootdir, 'logs') + + opts.tcpdump_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..', 'logs')) opts.stop_on_failure = options.stop_on_failure t.start_test('init')