From fb0966f9e393c5d29c3823c9fc51adc73a454afa Mon Sep 17 00:00:00 2001
From: Anush Shetty <ashetty@redhat.com>
Date: Tue, 30 May 2017 16:36:39 +0530
Subject: [PATCH] Changes to make the tests work with emptyvols

---
 0                                                 | 0
 1                                                 | 0
 script/test_in_openshift/lib.sh                   | 2 +-
 script/test_in_openshift/tests/buildconfig.sh     | 4 ++--
 script/test_in_openshift/tests/redis-replica-2.sh | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 0
 delete mode 100644 1

diff --git a/0 b/0
deleted file mode 100644
index e69de29b..00000000
diff --git a/1 b/1
deleted file mode 100644
index e69de29b..00000000
diff --git a/script/test_in_openshift/lib.sh b/script/test_in_openshift/lib.sh
index dd2f115d..6b09e675 100644
--- a/script/test_in_openshift/lib.sh
+++ b/script/test_in_openshift/lib.sh
@@ -192,7 +192,7 @@ function convert::kompose_up () {
     # Usage: convert::kompose_up <docker_compose_file>
     local compose_file=$1
     convert::print_msg "Running kompose up ..."
-    kompose --provider=openshift --emptyvols -f $compose_file up
+    kompose up --provider=openshift --emptyvols -f $compose_file
     exit_status=$?
 
     if [ $exit_status -ne 0 ]; then
diff --git a/script/test_in_openshift/tests/buildconfig.sh b/script/test_in_openshift/tests/buildconfig.sh
index 2e3556f8..b493f170 100755
--- a/script/test_in_openshift/tests/buildconfig.sh
+++ b/script/test_in_openshift/tests/buildconfig.sh
@@ -30,6 +30,6 @@ convert::kompose_up $docker_compose_file
 convert::kompose_up_check -p foo
 
 # Kompose down for buildconfig fails being tracked at #382
-# convert::kompose_down $docker_compose_file
+convert::kompose_down $docker_compose_file
 
-# convert::kompose_down_check 2
+convert::kompose_down_check 2
diff --git a/script/test_in_openshift/tests/redis-replica-2.sh b/script/test_in_openshift/tests/redis-replica-2.sh
index fe342812..4b61327a 100755
--- a/script/test_in_openshift/tests/redis-replica-2.sh
+++ b/script/test_in_openshift/tests/redis-replica-2.sh
@@ -23,7 +23,7 @@ source $KOMPOSE_ROOT/script/test_in_openshift/lib.sh
 convert::print_msg "Running tests for replica option"
 
 # Run kompose up
-kompose --provider=openshift --emptyvols --replicas 2 -f ${KOMPOSE_ROOT}/examples/docker-compose-counter.yaml up; exit_status=$?
+kompose up --provider=openshift --emptyvols --replicas 2 -f ${KOMPOSE_ROOT}/examples/docker-compose-counter.yaml; exit_status=$?
 
 if [ $exit_status -ne 0 ]; then
     convert::print_fail "kompose up has failed"