speed up tests

.github/workflows/testing.yml

@@ -26,13 +26,6 @@ jobs:
     - name: Run with 1 worker
       run: |
         ./tests.sh
-      env:
-        DOTDROP_WORKERS: 1
-    - name: Run with 4 workers
-      run: |
-        ./tests.sh
-      env:
-        DOTDROP_WORKERS: 4
     - name: Upload coverage reports to Codecov
       uses: codecov/codecov-action@v3
       with:

scripts/check-tests-ng.sh

@@ -13,8 +13,8 @@ workdir_tmp_exists="no"
 [ -d "${HOME}/.config/dotdrop/tmp" ] && workdir_tmp_exists="yes"
 
 # run bash tests
-GH_WORKFLOW=${GITHUB_WORKFLOW:-}
+in_cicd=${GITHUB_WORKFLOW:-}
-if [ -z "${GH_WORKFLOW}" ]; then
+if [ -z "${in_cicd}" ]; then
   ## local
   tests-ng/tests_launcher.py -s
 else

tests.sh

@@ -6,6 +6,14 @@
 set -eu -o errtrace -o pipefail
 
 cur=$(cd "$(dirname "${0}")" && pwd)
+in_cicd="${GH_WORKFLOW:-}"
+
+# patch TERM var in ci/cd
+if [ -n "${in_cicd}" ]; then
+  if [ -z "${TERM}" ]; then
+    export TERM="linux"
+  fi
+fi
 
 # make sure both version.py and manpage dotdrop.1 are in sync
 dotdrop_version=$(grep version dotdrop/version.py | sed 's/^.*= .\(.*\).$/\1/g')
@@ -19,14 +27,6 @@ echo "current dotdrop version ${dotdrop_version}"
 echo "=> python version:"
 python3 --version
 
-in_cicd="${GH_WORKFLOW:-}"
-if [ -n "${in_cicd}" ]; then
-  # in CI/CD
-  if [ -z "${TERM}" ]; then
-    export TERM="linux"
-  fi
-fi
-
 # test syntax
 echo "checking syntax..."
 "${cur}"/scripts/check-syntax.sh
@@ -36,8 +36,19 @@ echo "unittest..."
 "${cur}"/scripts/check-unittests.sh
 
 # tests-ng
-echo "tests-ng..."
+if [ -n "${in_cicd}" ]; then
-"${cur}"/scripts/check-tests-ng.sh
+  # in CI/CD
+  export DOTDROP_WORKERS=1
+  echo "tests-ng with ${DOTDROP_WORKERS} worker(s)..."
+  "${cur}"/scripts/check-tests-ng.sh
+
+  export DOTDROP_WORKERS=4
+  echo "tests-ng with ${DOTDROP_WORKERS} worker(s)..."
+  "${cur}"/scripts/check-tests-ng.sh
+else
+  echo "tests-ng..."
+  "${cur}"/scripts/check-tests-ng.sh
+fi
 
 # merge coverage
 coverage combine coverages/*