summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-03-05 15:14:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-05 15:14:29 +0000
commit52461860ac156ea729703535ff7e81b41e991108 (patch)
tree5134edb2360acee7a15a98ac43cf84a09b36214c
parent1fbd7bfcf3af86719721add8b8ca1f04dc0beb48 (diff)
parentaf5a2328a5474930c3967c1b1431fe8757dff236 (diff)
Merge "Import xtesting module"
-rw-r--r--requirements.txt1
-rw-r--r--sfc/lib/config.py1
-rw-r--r--sfc/tests/functest/run_sfc_tests.py2
3 files changed, 2 insertions, 2 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
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..f779e2a3 100644
--- a/sfc/tests/functest/run_sfc_tests.py
+++ b/sfc/tests/functest/run_sfc_tests.py
@@ -14,7 +14,7 @@ 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