From a222783533db12f624123aa931cf84d6f9cba3f4 Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Tue, 28 Mar 2017 12:27:22 +0300 Subject: Revert "Make SFC test a python call to main()" This reverts commit d5820bef80ea4bdb871380dbfe41db12290fc5f8. Robot test runs before SFC test and it imports https://github.com/robotframework/SSHLibrary which does a monkey patching in the python runtime / paramiko. Untill now sfc run in a new python process (clean) because it run using the bash command. But when importing it as a module and call main() from python, it will run in the patched runtime and it will error out. https://hastebin.com/iyobuxutib.py Change-Id: I54237c32c957718b363d302efe84e01bc78e4f47 Signed-off-by: George Paraskevopoulos (cherry picked from commit e59055e29b5cc6a027d3a24803cc05fd709cca90) --- functest/opnfv_tests/features/odl_sfc.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py index 431cd47e4..1956c9c8e 100644 --- a/functest/opnfv_tests/features/odl_sfc.py +++ b/functest/opnfv_tests/features/odl_sfc.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # import functest.core.feature_base as base -from sfc.tests.functest import run_tests class OpenDaylightSFC(base.FeatureBase): @@ -17,6 +16,5 @@ class OpenDaylightSFC(base.FeatureBase): super(OpenDaylightSFC, self).__init__(project='sfc', case='functest-odl-sfc', repo='dir_repo_sfc') - - def execute(self): - return run_tests.main() + dir_sfc_functest = '{}/sfc/tests/functest'.format(self.repo) + self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest -- cgit 1.2.3-korg