subtests make use of the subtest_properties hash map

Author: nv-kmcgill53

qa/L0_backend_python/test.sh

@@ -186,7 +186,12 @@ subtest_properties["logging"]=""
 subtest_properties["custom_metrics"]=""
 
 # Add tests depending on which environment is being run. 
+
 # If not running in igpu mode add these
+# Disable env test for Jetson since cloud storage repos are not supported
+# Disable ensemble, io and bls tests for Jetson since GPU Tensors are not supported
+# Disable variants test for Jetson since already built without GPU Tensor support
+# Disable decoupled test because it uses GPU tensors
 if [ "$TEST_JETSON" == "0" ]; then
     subtest_properties["ensemble"]=""
     subtest_properties["bls"]=""
@@ -196,6 +201,11 @@ if [ "$TEST_JETSON" == "0" ]; then
 fi
 
 # If not running on windows add these 
+# [DLIS-6093] Disable variants test for Windows since tests are not executed in docker container (cannot apt update/install)
+# [DLIS-5970] Disable io tests for Windows since GPU Tensors are not supported
+# [DLIS-6124] Disable restart test for Windows since it requires more investigation
+# [DLIS-6122] Disable model_control & request_rescheduling tests for Windows since they require load/unload
+# [DLIS-6123] Disable examples test for Windows since it requires updates to the example clients
 if [[ ${TEST_WINDOWS} == 0 ]]; then
     subtest_properties["variants"]=""
     subtest_properties["io"]=""
@@ -206,100 +216,66 @@ if [[ ${TEST_WINDOWS} == 0 ]]; then
     subtest_properties["request_rescheduling"]=""
 fi  
 
+ALL_SUBTESTS=$(echo "${!subtest_properties[@]}")
 if [[ -n "${SUBTESTS}" ]]; then
-    ALL_SUBTESTS=$(echo "${!subtest_properties[@]}")
     for subtest in $(echo "${!subtest_properties[@]}"); do 
         if [[ ! "${SUBTESTS}" =~ "${subtest}" ]]; then
             unset "subtest_properties[${subtest}]"
         fi
     done
 fi
+ALL_SUBTESTS=$(echo "${!subtest_properties[@]}")
 
 echo "Executing the following subtests: "
 for subtest in $(echo "${!subtest_properties[@]}"); do
     echo "  ${subtest}: ${subtest_properties[${subtest}]}"
 done
 
 exit 0
-bash -ex test_shared_memory.sh
-
-
 
-# Disable env test for Jetson since cloud storage repos are not supported
-# Disable ensemble, io and bls tests for Jetson since GPU Tensors are not supported
-# Disable variants test for Jetson since already built without GPU Tensor support
-# Disable decoupled test because it uses GPU tensors
-if [ "$TEST_JETSON" == "0" ]; then
-    SUBTESTS="ensemble bls decoupled response_sender"
-    # [DLIS-6093] Disable variants test for Windows since tests are not executed in docker container (cannot apt update/install)
-    # [DLIS-5970] Disable io tests for Windows since GPU Tensors are not supported
-    # [DLIS-6122] Disable model_control & request_rescheduling tests for Windows since they require load/unload
-    if [[ ${TEST_WINDOWS} == 0 ]]; then
-        SUBTESTS+=" variants io python_based_backends async_execute"
-    fi
-
-    for TEST in ${SUBTESTS}; do
-        # Run each subtest in a separate virtual environment to avoid conflicts
-        # between dependencies.
-        setup_virtualenv
-
-        set +e
-        (cd ${TEST} && bash -ex test.sh)
-        EXIT_CODE=$?
-        if [ $EXIT_CODE -ne 0 ]; then
-            echo "Subtest ${TEST} FAILED"
-            RET=$EXIT_CODE
-
-            # In bls test, it is allowed to fail with a strict memory leak of 480 bytes with exit code '123'.
-            # Propagate the exit code to make sure it's not overwritten by other tests.
-            if [[ ${TEST} == "bls" ]]  && [[ $EXIT_CODE -ne 1 ]] ; then
-                BLS_RET=$RET
-            fi
-        fi
-        set -e
-
-        deactivate_virtualenv
-    done
+if [[ "${ALL_SUBTETS}" =~ "shared_memory" ]]; then
+    bash -ex test_shared_memory.sh
+fi
 
-    # [DLIS-5969]: Incorporate env test for windows
-    if [[ ${PYTHON_ENV_VERSION} = "12" ]] && [[ ${TEST_WINDOWS} == 0 ]]; then
-        # In 'env' test we use miniconda for dependency management. No need to run
-        # the test in a virtual environment.
-        set +e
-        (cd env && bash -ex test.sh)
-        if [ $? -ne 0 ]; then
-            echo "Subtest env FAILED"
-            RET=1
-        fi
-        set -e
+for TEST in ${ALL_SUBTESTS}; do 
+    if [[ "${TEST}" == "env" ]]; then 
+        continue
     fi
-fi
 
-SUBTESTS="lifecycle argument_validation logging custom_metrics"
-# [DLIS-6124] Disable restart test for Windows since it requires more investigation
-# [DLIS-6122] Disable model_control & request_rescheduling tests for Windows since they require load/unload
-# [DLIS-6123] Disable examples test for Windows since it requires updates to the example clients
-if [[ ${TEST_WINDOWS} == 0 ]]; then
-    # TODO: Reimplement restart on decoupled data pipeline and enable restart.
-    SUBTESTS+=" model_control examples request_rescheduling"
-fi
-for TEST in ${SUBTESTS}; do
     # Run each subtest in a separate virtual environment to avoid conflicts
     # between dependencies.
     setup_virtualenv
 
     set +e
     (cd ${TEST} && bash -ex test.sh)
-
-    if [ $? -ne 0 ]; then
+    EXIT_CODE=$?
+    if [ $EXIT_CODE -ne 0 ]; then
         echo "Subtest ${TEST} FAILED"
-        RET=1
+        RET=$EXIT_CODE
+
+        # In bls test, it is allowed to fail with a strict memory leak of 480 bytes with exit code '123'.
+        # Propagate the exit code to make sure it's not overwritten by other tests.
+        if [[ ${TEST} == "bls" ]]  && [[ $EXIT_CODE -ne 1 ]] ; then
+            BLS_RET=$RET
+        fi
     fi
     set -e
 
     deactivate_virtualenv
 done
 
+if [[ ${ALL_SUBTESTS} =~ "env" ]]; then
+    # In 'env' test we use miniconda for dependency management. No need to run
+    # the test in a virtual environment.
+    set +e
+    (cd env && bash -ex test.sh)
+    if [ $? -ne 0 ]; then
+        echo "Subtest env FAILED"
+        RET=1
+    fi
+    set -e
+fi
+
 if [ $RET -eq 0 ]; then
   echo -e "\n***\n*** Test Passed\n***"
 else