summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-25 10:01:34 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-25 10:01:34 +0000
commit71e688eee322a1d6a697d4328783eff5254918d0 (patch)
tree4572c8e471a4175b422723d49fde9e0ea373eaf7 /docker
parente21c11998ea4b412863e09021e3266a98cc55b08 (diff)
parent76b49b8c1eefcebe69d798157cb7742152a57155 (diff)
Merge "Add support for Promise test cases"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rwxr-xr-xdocker/run_tests.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3c5a2a657..45aa05c7b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -54,6 +54,8 @@ libxml2-dev \
libffi-dev \
crudini \
ruby1.9.1-dev \
+npm \
+nodejs \
--no-install-recommends
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index d4aadd464..48e3741f8 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -143,7 +143,8 @@ function run_test(){
;;
"promise")
info "Running PROMISE test case..."
- # TODO
+ python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py --debug all ${report}
+ clean_openstack
;;
"doctor")
info "Running Doctor test..."