diff options
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | sfc/lib/config.py | 1 | ||||
| -rw-r--r-- | sfc/tests/functest/run_sfc_tests.py | 10 |
4 files changed, 2 insertions, 12 deletions
diff --git a/requirements.txt b/requirements.txt index dce5e2e0..93511b97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ python-tackerclient>=0.8.0 # Apache-2.0 PyYAML>=3.10.0 # MIT opnfv snaps +xtesting # Apache-2.0 @@ -5,5 +5,3 @@ home-page = https://wiki.opnfv.org/display/sfc/Service+Function+Chaining+Home [files] packages = sfc -scripts = - sfc/tests/functest/run_sfc_tests.py diff --git a/sfc/lib/config.py b/sfc/lib/config.py index 6ced2763..5ee3077a 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -31,7 +31,6 @@ class CommonConfig(object): def __init__(self): self.line_length = 30 - self.test_db = os.environ['TEST_DB_URL'] self.functest_repo_path = os.path.dirname(functest.__file__) self.functest_logging_api = os.path.join(self.functest_repo_path, "ci", "logging.ini") diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py index e818e10b..a22d5fb2 100644 --- a/sfc/tests/functest/run_sfc_tests.py +++ b/sfc/tests/functest/run_sfc_tests.py @@ -11,10 +11,9 @@ import importlib import os import time -import sys import yaml -from functest.core import testcase +from xtesting.core import testcase from opnfv.utils import ovs_logger as ovs_log from opnfv.deployment.factory import Factory as DeploymentFactory from sfc.lib import cleanup as sfc_cleanup @@ -185,10 +184,3 @@ class SfcFunctest(testcase.TestCase): return testcase.TestCase.EX_OK return testcase.TestCase.EX_RUN_ERROR - - -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s' - '- %(levelname)s - %(message)s') - SFC = SfcFunctest() - sys.exit(SFC.run()) |