Consolidate common files for Roles tests

cyberark · Dec 22, 2021 · d2d5f3b · d2d5f3b
1 parent 5a695cf
commit d2d5f3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 36 deletions.
diff --git a/roles/conjur_host_identity/tests/test.sh b/roles/conjur_host_identity/tests/test.sh
@@ -55,8 +55,10 @@ function setup_conjur {
 
 function run_test_cases {
   for test_case in test_cases/*; do
-    teardown_and_setup
-    run_test_case "$(basename -- "$test_case")"
+    if [ "${test_case}" != "test_cases/common" ]; then
+      teardown_and_setup
+      run_test_case "$(basename -- "$test_case")"
+    fi
   done
 }
 
@@ -71,7 +73,7 @@ function run_test_case {
     "
     docker exec "${ansible_cid}" bash -ec "
       cd tests
-      py.test --junitxml=./junit/${test_case} --connection docker -v test_cases/${test_case}/tests/test_default.py
+      py.test --junitxml=./junit/${test_case} --connection docker -v test_cases/common/test_default.py
     "
   else
     echo ERROR: run_test called with no argument 1>&2

diff --git a/...ity-from-collection/tests/test_default.py → ...y/tests/test_cases/common/test_default.py b/...ity-from-collection/tests/test_default.py → ...y/tests/test_cases/common/test_default.py
diff --git a/..._host_identity/tests/test_cases/configure-conjur-identity-from-role/tests/test_default.py b/..._host_identity/tests/test_cases/configure-conjur-identity-from-role/tests/test_default.py