From 90e33052d2c4a18001d1ddbeb42202993be78355 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Thu, 20 Jul 2023 11:17:37 +0200 Subject: [PATCH] Configure pytest to properly locate conftest.py In pytest 7.4.0, there were some changes to how the configuration file for pytest is located. In our case, this resulted in a failure to find the conftest.py with the needed fixtures which then prevented our python tests from being executed successfully. Configure the --confcutdir to ensure it points to the system test directory, where our conftest.py is located. Related https://github.com/pytest-dev/pytest/pull/11043 --- bin/tests/system/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index a57308dab91..2330d7c4a04 100755 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -237,7 +237,7 @@ if [ $status -eq 0 ]; then if start_servers; then run=$((run+1)) test_status=0 - (cd "$systest" && "$PYTEST" -rsxX -v "$test" "$@" || echo "$?" > "$test.status") | SYSTESTDIR="$systest" cat_d + (cd "$systest" && "$PYTEST" --confcutdir ../ -rsxX -v "$test" "$@" || echo "$?" > "$test.status") | SYSTESTDIR="$systest" cat_d if [ -f "$systest/$test.status" ]; then if [ "$(cat "$systest/$test.status")" != "5" ]; then test_status=$(cat "$systest/$test.status")