Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025
diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl
 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
 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
 # preparepythonenvironment
 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)


 # 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
		# preparepythonenvironment
		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)
Expand All		@@ -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
Expand Down