Fix: st2-run-pack-tests (#6340)

* Fix: st2-run-pack-tests

- Include dependency for pytest-cov to allow coverage to be included when running script with '-c'
- Fix test path when specifying the file with  '-f'
- Correct '-f' usage to follow pytest syntax:
  test_action_download.py::DownloadGitRepoActionTestCase::test_run_pack_download

Author: NitinNahal

CHANGELOG.rst

@@ -80,7 +80,7 @@ Added
   #6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253
   #6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306 #6307
   #6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326 #6327 #6328
-  #6329 #6330
+  #6329 #6330 #6337
   Contributed by @cognifloyd
 * Build of ST2 EL9 packages #6153
   Contributed by @amanda11

st2common/bin/st2-run-pack-tests

@@ -36,12 +36,12 @@ function join { local IFS="$1"; shift; echo "$*"; }
 PACK_TEST_PYTHON_DEPENDENCIES_NAMES=(
     'pytest'
     'mock'
-    'coverage'
+    'pytest-cov'
 )
 PACK_TEST_PYTHON_DEPENDENCIES_VERSIONS=(
     '>7'
     '>=4.0.3'
-    '>=4.4.1'
+    '>=6.1.1'
 )
 
 VIRTUALENVS_DIR="/tmp/st2-pack-tests-virtualenvs"
@@ -69,7 +69,7 @@ STACKSTORM_VIRTUALENV_PYTHON_BINARY="${STACKSTORM_VIRTUALENV_BIN}/python"
 
 function usage() {
     echo "Usage: $0  [-c] [-j] [-t] [-v] [-x] -p <path to pack> [-f <test file module / class / method>]" >&2
-    echo "  -f : Run a specific test file or test class method (e.g. -f test_action_download:DownloadGitRepoActionTestCase.test_run_pack_download)" >&2
+    echo "  -f : Run a specific test file or test class method (e.g. -f test_action_download.py::DownloadGitRepoActionTestCase::test_run_pack_download)" >&2
     echo "  -c : Run tests with code coverage reporting enabled" >&2
     echo "  -j : Just run tests. Use previously installed dependencies" >&2
     echo "       and virtualenv, if any, for subsequent test runs." >&2
@@ -270,7 +270,7 @@ elif [ "${ENABLE_COVERAGE}" = true ]; then
     for((i = 0; i < ${#PACK_TEST_PYTHON_DEPENDENCIES_NAMES[@]}; i++)); do
         DEPENDENCY_NAME="${PACK_TEST_PYTHON_DEPENDENCIES_NAMES[$i]}"
 
-        if [ "${DEPENDENCY_NAME}" = "coverage" ]; then
+        if [ "${DEPENDENCY_NAME}" = "pytest-cov" ]; then
             DEPENDENCY_VERSION="${PACK_TEST_PYTHON_DEPENDENCIES_VERSIONS[$i]}"
 
             echo ${INSTALLED_PIP_PACKAGES} | grep "${DEPENDENCY_NAME}"  > /dev/null || pip install --cache-dir ${HOME}/.pip-cache ${ST2_PIP_OPTIONS} "${DEPENDENCY_NAME}${DEPENDENCY_VERSION}"
@@ -333,23 +333,15 @@ if [ "${ENABLE_COVERAGE}" = true ]; then
   done # end for each $PACK_PYTHON_DIR
 fi # end enable test coverage
 
-PYTEST=(pytest)
-if head -n 1 $(command -v pytest) | grep -q ' -sE$'; then
-    # workaround pants+pex default of hermetic scripts so we can run pytest with PYTHONPATH
-    if [ -f "${STACKSTORM_VIRTUALENV_PYTHON_BINARY}" ]; then
-        PYTEST=(${STACKSTORM_VIRTUALENV_PYTHON_BINARY} -m "pytest")
-    else
-        PYTEST=(python3 -m "pytest")
-    fi
-fi
+PYTEST=(python3 -m pytest)
 
 # Change to the pack's directory (required for test coverage reporting)
 pushd ${PACK_PATH} > /dev/null
 
 # Execute the tests
 if [ "${TEST_LOCATION}" ]; then
     # Run a specific test file, class or method
-    ${PYTEST[@]} ${PYTEST_OPTS[@]} ${TEST_LOCATION}
+    ${PYTEST[@]} ${PYTEST_OPTS[@]} ${PACK_TESTS_PATH}${TEST_LOCATION}
 else
     # Run all tests inside the pack
     ${PYTEST[@]} ${PYTEST_OPTS[@]} ${PACK_TESTS_PATH}