summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-11-23 08:52:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-23 08:52:53 +0000
commit453784f3cae39e7b59e530d27f0b49cef17c7e55 (patch)
tree0a0c99f7448056e93591d18f9b4cdeeb99662773
parentc825e41b2ec5ddccd051e7764496e4a2de71fef6 (diff)
parent32efcccb9ac10b8105ff00dfe5c5b04b4a8575e1 (diff)
Merge "bugfix: domino test can not be executed"
-rw-r--r--functest/ci/exec_test.sh3
-rwxr-xr-xfunctest/opnfv_tests/features/domino.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index b15f5351..8dc409d3 100644
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -156,9 +156,6 @@ function run_test(){
$clean_flag -s -m feature_multisite $report \
-c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
;;
- "domino")
- python ${FUNCTEST_TEST_DIR}/features/domino.py $report
- ;;
"odl-sfc")
ODL_SFC_DIR=${repos_dir}/sfc/tests/functest/odl-sfc
FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
index 445a7a64..be3dd549 100755
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -31,6 +31,7 @@ class DominoCases(TestCasesBase.TestCasesBase):
logger = ft_logger.Logger("domino").getLogger()
def __init__(self):
+ super(DominoCases, self).__init__()
self.project_name = "domino"
self.case_name = "domino-multinode"
@@ -70,7 +71,7 @@ if __name__ == '__main__':
parser.add_argument("-r", "--report",
help="Create json result file",
action="store_true")
- args = parser.parse_args()
+ args = vars(parser.parse_args())
domino = DominoCases()
try:
result = domino.main(**args)