From b02ad413e55d132e1f0d735aa23ea892426c866f Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Tue, 6 Feb 2024 13:28:13 +0100 Subject: [PATCH] Fix parallel backup tests Ported from https://github.com/canonical/mysql-operator/pull/355 Noticed in https://warthogs.atlassian.net/browse/DPE-3387 --- tests/integration/test_backups.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_backups.py b/tests/integration/test_backups.py index 9495dd12e..b62e97a2d 100644 --- a/tests/integration/test_backups.py +++ b/tests/integration/test_backups.py @@ -4,6 +4,7 @@ import logging import socket +import uuid from pathlib import Path import boto3 @@ -63,17 +64,21 @@ def cloud_credentials( @pytest.fixture(scope="session") def cloud_configs(microceph: pytest_microceph.ConnectionInformation): + # Add UUID to path to avoid conflict with tests running in parallel (e.g. multiple Juju + # versions on a PR, multiple PRs) + path = f"mysql-k8s/{uuid.uuid4()}" + return { "aws": { "endpoint": "https://s3.amazonaws.com", "bucket": "data-charms-testing", - "path": "mysql-k8s", + "path": path, "region": "us-east-1", }, "gcp": { "endpoint": "https://storage.googleapis.com", "bucket": "data-charms-testing", - "path": "mysql-k8s", + "path": path, "region": "", }, "ceph": {