Use nosetests if python3 is not available

Signed-off-by: Martin Styk <[email protected]>
beaker-project · Nov 17, 2023 · 355cb0d · 355cb0d
1 parent 7164abf
commit 355cb0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/Client/run-tests.sh b/Client/run-tests.sh
@@ -1,15 +1,12 @@
-#/bin/bash
+#!/bin/bash
 
 set -x
 
-# Use Python 2 version if BKR_PY3 is not defined
-if [[ -z ${BKR_PY3} ]]; then
-    pytest_command="py.test-2";
-elif [[ ${BKR_PY3} == 1 ]]; then
-    pytest_command="pytest-3";
+# Use nosetests with python2 interpreter
+if [[ -z ${BKR_PY3} ]] || [[ ${BKR_PY3} != 1 ]]; then
+    command="nosetests ${*:--v --traverse-namespace bkr.client.tests}";
 else
-    pytest_command="py.test-2";
+    command="pytest-3";
 fi
 
-env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \
-    $pytest_command
+env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} "$command"
diff --git a/Common/run-tests.sh b/Common/run-tests.sh
@@ -2,14 +2,11 @@
 
 set -x
 
-# Use Python 2 version if BKR_PY3 is not defined
-if [[ -z ${BKR_PY3} ]]; then
-    pytest_command="py.test-2";
-elif [[ ${BKR_PY3} == 1 ]]; then
-    pytest_command="pytest-3";
+# Use nosetests with python2 interpreter
+if [[ -z ${BKR_PY3} ]] || [[ ${BKR_PY3} != 1 ]]; then
+    command="nosetests ${*:--v bkr}";
 else
-    pytest_command="py.test-2";
+    command="pytest-3";
 fi
 
-env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \
-    $pytest_command
+env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} "$command"