Skip to content
This repository has been archived by the owner on Sep 7, 2020. It is now read-only.

Commit

Permalink
test_flows.py: remove rootdir and installdir from TestFlows
Browse files Browse the repository at this point in the history
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) <[email protected]>
  • Loading branch information
arnout authored and mergify[bot] committed Apr 7, 2020
1 parent 32d2da5 commit 09d7f6d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tests/test_flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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')
Expand Down

0 comments on commit 09d7f6d

Please sign in to comment.