Refactor and enhance the test-target e2e test step (#21030)

* refactor test

* refactor

Author: steveny91

.github/workflows/test-target.yml

@@ -274,30 +274,22 @@ jobs:
         #   ddev will interpret '-m' as an environment to run the e2e test on and fails
         # This is not required when no pytest args are provided and it will run all environments
         #   by default
-        if [ '${{ inputs.pytest-args }}' = '-m flaky' ]; then
-          set +e # Disable immediate exit
-          ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
-          exit_code=$?
-          if [ $exit_code -eq 5 ]; then
-            # Flaky test count can be zero, this is done to avoid pipeline failure
-            echo "No tests were collected."
-            exit 0
-          else
-            exit $exit_code
-          fi
-        elif [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
-          set +e # Disable immediate exit
-          ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
+        set +e # Disable immediate exit
+        PYTEST_ARGS='${{ inputs.pytest-args }}'
+
+        if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
+          ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
           exit_code=$?
-          if [ $exit_code -eq 5 ]; then
-            # Flaky test count can be zero, this is done to avoid pipeline failure
-            echo "No tests were collected."
-            exit 0
-          else
-            exit $exit_code
-          fi
         else
           ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
+          exit_code=$?
+        fi
+
+        if [ "$exit_code" -eq 5 ]; then
+          echo "No tests were collected."
+          exit 0
+        else
+          exit "$exit_code"
         fi
 
     - name: Run E2E tests
@@ -312,30 +304,22 @@ jobs:
         #   ddev will interpret '-m' as an environment to run the e2e test on and fails
         # This is not required when no pytest args are provided and it will run all environments
         #   by default
-        if [ '${{ inputs.pytest-args }}' = '-m flaky' ]; then
-          set +e # Disable immediate exit
-          ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
-          exit_code=$?
-          if [ $exit_code -eq 5 ]; then
-            # Flaky test count can be zero, this is done to avoid pipeline failure
-            echo "No tests were collected."
-            exit 0
-          else
-            exit $exit_code
-          fi
-        elif [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
-          set +e # Disable immediate exit
-          ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
+        set +e # Disable immediate exit
+        PYTEST_ARGS='${{ inputs.pytest-args }}'
+
+        if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
+          ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
           exit_code=$?
-          if [ $exit_code -eq 5 ]; then
-            # Flaky test count can be zero, this is done to avoid pipeline failure
-            echo "No tests were collected."
-            exit 0
-          else
-            exit $exit_code
-          fi
         else
           ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
+          exit_code=$?
+        fi
+
+        if [ "$exit_code" -eq 5 ]; then
+          echo "No tests were collected."
+          exit 0
+        else
+          exit "$exit_code"
         fi
 
     - name: Run benchmarks