aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>2017-03-28 12:27:22 +0300
committerJose Lausuch <jose.lausuch@ericsson.com>2017-03-28 12:10:25 +0000
commita222783533db12f624123aa931cf84d6f9cba3f4 (patch)
treec85516a6bbf1ad2d27211fbd8e7ab9eeb295c771
parentb5383d11fa9e54b6ff01d9a08e5f5373af289db1 (diff)
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 <geopar@intracom-telecom.com> (cherry picked from commit e59055e29b5cc6a027d3a24803cc05fd709cca90)
-rw-r--r--functest/opnfv_tests/features/odl_sfc.py6
1 files 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