Make run_tests.sh uv-compatible

Signed-off-by: Thomas Calmant <[email protected]>

Author: tcalmant

run_tests.sh

@@ -1,44 +1,83 @@
 #!/bin/bash
 #
-# Script to execute tests in Docker
+# Script to execute tests in Docker / CI / UV environment
 #
 
+if [ -z "$UV" ]
+then
+    echo "UV is not set"
+else
+    echo "Using UV at $UV"
+fi
+
+run_pip_install() {
+    if [ -z "$UV" ]
+    then
+        pip install "$@"
+        return $?
+    else
+        uv pip install "$@"
+        return $?
+    fi
+}
+
+run_pip_uninstall() {
+    if [ -z "$UV" ]
+    then
+        pip uninstall -y "$@"
+        return $?
+    else
+        uv pip uninstall "$@"
+        return $?
+    fi
+}
+
+run_coverage() {
+    if [ -z "$UV" ]
+    then
+        coverage "$@"
+        return $?
+    else
+        uv run coverage "$@"
+        return $?
+    fi
+}
+
+run_lib_tests() {
+    export JSONRPCLIB_TEST_EXPECTED_LIB="$1"
+    run_pip_install "$2"
+    if [ $? -ne 0 ]
+    then
+        echo "Failed to install $2"
+        return 0
+    fi
+
+    run_coverage run -m pytest tests/test_jsonlib.py
+    rc=$?
+    run_pip_uninstall "$2"
+    return $rc
+}
+
 echo "Installing dependencies..."
-pip install pytest coverage || exit 1
+run_pip_install pytest coverage || exit 1
 export COVERAGE_PROCESS_START=".coveragerc"
 
 echo "Initial tests..."
 export JSONRPCLIB_TEST_EXPECTED_LIB=json
-coverage run -m pytest || exit 1
+run_coverage run -m pytest || exit 1
 
 echo "orJson tests..."
-pip install orjson && (
-    export JSONRPCLIB_TEST_EXPECTED_LIB=orjson
-    coverage run -m pytest tests/test_jsonlib.py || exit 1
-    pip uninstall -y orjson
-)
+run_lib_tests orjson orjson || exit 1
 
 echo "uJson tests..."
-pip install ujson && (
-    export JSONRPCLIB_TEST_EXPECTED_LIB=ujson
-    coverage run -m pytest tests/test_jsonlib.py || exit 1
-    pip uninstall -y ujson
-)
+run_lib_tests ujson ujson || exit 1
 
 echo "cJson tests..."
-pip install python-cjson && (
-    export JSONRPCLIB_TEST_EXPECTED_LIB=cjson
-    coverage run -m pytest tests/test_jsonlib.py || exit 1
-    pip uninstall -y python-cjson
-)
+run_lib_tests cjson python-cjson || exit 1
 
 echo "simplejson tests..."
-pip install simplejson && (
-    export JSONRPCLIB_TEST_EXPECTED_LIB=simplejson
-    coverage run -m pytest tests/test_jsonlib.py || exit 1
-    pip uninstall -y simplejson
-)
+run_lib_tests simplejson simplejson || exit 1
 
 echo "Combine results..."
-coverage combine || exit $?
-coverage report
+run_coverage combine || exit $?
+run_coverage report