diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl
index c1ddeab6..3bdc6640 100644
--- a/Dockerfile--ubuntu_24_04.tmpl
+++ b/Dockerfile--ubuntu_24_04.tmpl
@@ -9,6 +9,7 @@ RUN apt update
RUN apt install -y sudo curl ca-certificates
RUN apt update
RUN apt install -y openssh-server
+RUN apt install -y time
RUN apt update
RUN apt install -y postgresql-common
diff --git a/run_tests.sh b/run_tests.sh
index 0fecde60..a40a97cf 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -8,24 +8,17 @@ if [ -z ${TEST_FILTER+x} ]; \
then export TEST_FILTER="TestgresTests or (TestTestgresCommon and (not remote_ops))"; \
fi
-# choose python version
-echo python version is $PYTHON_VERSION
-VIRTUALENV="virtualenv --python=/usr/bin/python$PYTHON_VERSION"
-PIP="pip$PYTHON_VERSION"
-
# fail early
echo check that pg_config is in PATH
command -v pg_config
-# prepare environment
-VENV_PATH=/tmp/testgres_venv
+# prepare python environment
+VENV_PATH="/tmp/testgres_venv"
rm -rf $VENV_PATH
-$VIRTUALENV $VENV_PATH
+virtualenv --python="/usr/bin/python${PYTHON_VERSION}" "${VENV_PATH}"
export VIRTUAL_ENV_DISABLE_PROMPT=1
-source $VENV_PATH/bin/activate
-
-# install utilities
-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil
+source "${VENV_PATH}/bin/activate"
+pip install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil
# install testgres' dependencies
export PYTHONPATH=$(pwd)
@@ -45,15 +38,13 @@ time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
# run tests (PG_BIN)
-time \
- PG_BIN=$(pg_config --bindir) \
- coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
+PG_BIN=$(pg_config --bindir) \
+time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
# run tests (PG_CONFIG)
-time \
- PG_CONFIG=$(pg_config --bindir)/pg_config \
- coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
+PG_CONFIG=$(pg_config --bindir)/pg_config \
+time coverage run -a -m pytest -l -v -n 4 -k "${TEST_FILTER}"
# show coverage
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy