Merge pull request #40054 from owncloud/python2-caldav-carddav

[tests-only] Explicitly use python2 for carddav and caldav tests
owncloud · May 25, 2022 · 1252e5d · 1252e5d
2 parents abb7620 + acc68d7
commit 1252e5d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apps/dav/tests/ci/caldav-old-endpoint/script.sh b/apps/dav/tests/ci/caldav-old-endpoint/script.sh
@@ -13,7 +13,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CalDAV/current-user-principal.xml" \
 	"CalDAV/sync-report.xml"
 

diff --git a/apps/dav/tests/ci/caldav/script.sh b/apps/dav/tests/ci/caldav/script.sh
@@ -9,7 +9,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CalDAV/current-user-principal.xml" \
 	"CalDAV/sync-report.xml" \
 	"CalDAV/sharing-calendars.xml"

diff --git a/apps/dav/tests/ci/carddav-old-endpoint/script.sh b/apps/dav/tests/ci/carddav-old-endpoint/script.sh
@@ -13,7 +13,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CardDAV/current-user-principal.xml" \
 	"CardDAV/sync-report.xml"
 

diff --git a/apps/dav/tests/ci/carddav/script.sh b/apps/dav/tests/ci/carddav/script.sh
@@ -9,7 +9,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CardDAV/current-user-principal.xml" \
 	"CardDAV/sync-report.xml" \
 	"CardDAV/sharing-addressbooks.xml"