From db0cc224d615a096e147b630a60b50e21a99c445 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Wed, 8 Mar 2017 01:25:25 +0200 Subject: Regression: fix Python3 list of ports, update trex21 benchmark, other minor changes Change-Id: Iad785f8c505af487e201751ad8a8bfb03205cb73 Signed-off-by: Yaroslav Brustinov --- scripts/automation/regression/trex_unit_test.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/automation/regression/trex_unit_test.py') diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 6d7f26f6..f915448d 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -483,12 +483,11 @@ class CTRexTestConfiguringPlugin(Plugin): fatal('Could not restart TRex daemon server') print('Restarted.') + if not self.no_daemon: if self.kill_running: client.kill_all_trexes() - else: - if client.get_trex_cmds(): - fatal('TRex is already running') - if not self.no_daemon: + elif client.get_trex_cmds(): + fatal('TRex is already running. Use --kill-running flag to kill it.') try: client.check_server_connectivity() except Exception as e: -- cgit 1.2.3-korg