diff options
| -rw-r--r-- | test/framework.py | 11 | ||||
| -rw-r--r-- | test/test_vcl.py | 83 |
2 files changed, 42 insertions, 52 deletions
diff --git a/test/framework.py b/test/framework.py index aedfbdf8e52..4bc64a1331b 100644 --- a/test/framework.py +++ b/test/framework.py @@ -1457,15 +1457,24 @@ class VppTestRunner(unittest.TextTestRunner): class Worker(Thread): - def __init__(self, args, logger, env={}): + def __init__(self, args, logger, env=None): self.logger = logger self.args = args + self.process = None self.result = None + env = {} if env is None else env self.env = copy.deepcopy(env) super(Worker, self).__init__() def run(self): executable = self.args[0] + if not os.path.exists(executable) or not os.access( + executable, os.F_OK | os.X_OK): + # Exit code that means some system file did not exist, + # could not be opened, or had some other kind of error. + self.result = os.EX_OSFILE + raise EnvironmentError( + "executable '%s' is not found or executable." % executable) self.logger.debug("Running executable w/args `%s'" % self.args) env = os.environ.copy() env.update(self.env) diff --git a/test/test_vcl.py b/test/test_vcl.py index 18279e9f226..c10eea4594c 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -9,6 +9,20 @@ from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, FibPathProto +iperf3 = '/usr/bin/iperf3' + + +def have_app(app): + try: + subprocess.check_output([app, '-v']) + except (subprocess.CalledProcessError, OSError): + return False + return True + + +_have_iperf3 = have_app(iperf3) +_have_permissions = os.geteuid() == 0 + class VCLAppWorker(Worker): """ VCL Test Application Worker """ @@ -44,7 +58,7 @@ class VCLTestCase(VppTestCase): var = "VPP_BUILD_DIR" self.build_dir = os.getenv(var, None) if self.build_dir is None: - raise Exception("Environment variable `%s' not set" % var) + raise EnvironmentError("Environment variable `%s' not set" % var) self.vppDebug = 'vpp_debug' in self.build_dir self.server_addr = "127.0.0.1" self.server_port = "22000" @@ -70,7 +84,6 @@ class VCLTestCase(VppTestCase): def cut_thru_test(self, server_app, server_args, client_app, client_args): self.env = {'VCL_API_PREFIX': self.shm_prefix, 'VCL_APP_SCOPE_LOCAL': "true"} - worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() @@ -171,6 +184,8 @@ class VCLTestCase(VppTestCase): self.vapi.session_enable_disable(is_enabled=0) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + @unittest.skipUnless(_have_permissions, 'Need to run as root. Skipping.') def thru_host_stack_test(self, server_app, server_args, client_app, client_args): self.env = {'VCL_API_PREFIX': self.shm_prefix, @@ -197,6 +212,8 @@ class VCLTestCase(VppTestCase): self.sleep(self.post_test_sleep) def validateResults(self, worker_client, worker_server, timeout): + if worker_server.process is None: + raise RuntimeError('worker_server is not running.') if os.path.isdir('/proc/{}'.format(worker_server.process.pid)): self.logger.info("Killing server worker process (pid %d)" % worker_server.process.pid) @@ -218,7 +235,7 @@ class VCLTestCase(VppTestCase): "Couldn't kill client worker process") raise if error: - raise Exception( + raise RuntimeError( "Timeout! Client worker did not finish in %ss" % timeout) self.assert_equal(worker_client.result, 0, "Binary test return code") @@ -268,30 +285,14 @@ class LDPCutThruTestCase(VCLTestCase): self.cut_thru_test("sock_test_server", self.server_args, "sock_test_client", self.client_echo_test_args) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + @unittest.skipUnless(_have_permissions, 'Need to run as root. Skipping.') def test_ldp_cut_thru_iperf3(self): """ run LDP cut thru iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except subprocess.CalledProcessError: - self.logger.error( - "WARNING: Subprocess returned non-0 running 'iperf3 -v") - self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") - return - except OSError as e: - self.logger.error( - "WARNING: Subprocess returned with OS error (%s) %s\n" - " 'iperf3' is likely not installed,", - e.errno, e.strerror) - self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") - return - except Exception: - self.logger.exception( - "Subprocess returned non-0 running 'iperf3 -v") - self.timeout = self.client_iperf3_timeout - self.cut_thru_test("iperf3", self.server_iperf3_args, - "iperf3", self.client_iperf3_args) + self.cut_thru_test(iperf3, self.server_iperf3_args, + iperf3, self.client_iperf3_args) @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_uni_dir_nsock(self): @@ -633,28 +634,14 @@ class LDPThruHostStackIperf(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + @unittest.skipUnless(_have_permissions, 'Need to run as root. Skipping.') def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except subprocess.CalledProcessError: - self.logger.error("WARNING: 'iperf3' is not installed,") - self.logger.error( - " 'test_ldp_thru_host_stack_iperf3' not run!") - return - except OSError as e: - self.logger.error("WARNING: 'iperf3' is not installed,") - self.logger.error(" 'test' not run!") - return - except Exception as e: - self.logger.error("WARNING: 'iperf3' unexpected error,") - self.logger.error(" 'test' not run!") - return - self.timeout = self.client_iperf3_timeout - self.thru_host_stack_test("iperf3", self.server_iperf3_args, - "iperf3", self.client_iperf3_args) + self.thru_host_stack_test(iperf3, self.server_iperf3_args, + iperf3, self.client_iperf3_args) class LDPIpv6CutThruTestCase(VCLTestCase): @@ -704,21 +691,15 @@ class LDPIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_echo_test_args) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + @unittest.skipUnless(_have_permissions, 'Need to run as root. Skipping.') @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_iperf3(self): """ run LDP IPv6 cut thru iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except: - self.logger.error("WARNING: 'iperf3' is not installed,") - self.logger.error( - " 'test_ldp_ipv6_cut_thru_iperf3' not run!") - return - self.timeout = self.client_iperf3_timeout - self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args, - "iperf3", self.client_ipv6_iperf3_args) + self.cut_thru_test(iperf3, self.server_ipv6_iperf3_args, + iperf3, self.client_ipv6_iperf3_args) @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_uni_dir_nsock(self): |