diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh index 823d725e8b7..75662ccb2a1 100755 --- a/.ci/run_tests.sh +++ b/.ci/run_tests.sh @@ -124,7 +124,7 @@ else fi # Create an empty minio folder with appropriate permissions so www user can write inside it -mkdir -p /tmp/minio_tests/test_bucket && chmod -R 777 /tmp/minio_tests +mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests # Create an empty webdav folder with appropriate permissions so www user can write inside it mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests diff --git a/.ci/test_blocklist_qt5.txt b/.ci/test_blocklist_qt5.txt index 382a521d495..44c446b9af8 100644 --- a/.ci/test_blocklist_qt5.txt +++ b/.ci/test_blocklist_qt5.txt @@ -24,6 +24,3 @@ test_core_layerdefinition PyQgsProviderConnectionMssql PyQgsStyleStorageMssql -# CI setup is no longer working for this test -PyQgsExternalStorageAwsS3 - diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8a01847c927..696cf89a9d1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -409,7 +409,7 @@ jobs: echo "TEST_BATCH=$TEST_BATCH" echo "DOCKERFILE=$DOCKERFILE" mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests - mkdir -p /tmp/minio_tests/test_bucket && chmod -R 777 /tmp/minio_tests + mkdir -p /tmp/minio_tests/test-bucket && chmod -R 777 /tmp/minio_tests docker-compose -f .docker/$DOCKERFILE run qgis-deps /root/QGIS/.docker/docker-qgis-test.sh $TEST_BATCH - name: Archive test results report diff --git a/tests/src/python/test_qgsexternalstorage_awss3.py b/tests/src/python/test_qgsexternalstorage_awss3.py index a0d3e911273..8c57199a251 100644 --- a/tests/src/python/test_qgsexternalstorage_awss3.py +++ b/tests/src/python/test_qgsexternalstorage_awss3.py @@ -34,7 +34,7 @@ class TestPyQgsExternalStorageAwsS3(TestPyQgsExternalStorageBase, unittest.TestC super().setUpClass() unittest.TestCase.setUpClass() - bucket_name = "test_bucket" + bucket_name = "test-bucket" cls.auth_config = QgsAuthMethodConfig("AWSS3") cls.auth_config.setConfig("username", "minioadmin")