From 94ce0b472160e423209e4e831606147248894be9 Mon Sep 17 00:00:00 2001 From: Jitka Halova Date: Mon, 17 Aug 2026 14:12:00 +0200 Subject: [PATCH] Fix parallel CLI test name collisions Assisted By: Claude Opus 4.6 (cherry picked from commit 8bb46eda711b20407889533fbdcfc580359221e9) --- tests/scripts/pulp_gem/test_content.sh | 18 ++++++++-------- tests/scripts/pulp_gem/test_distribution.sh | 16 +++++++------- tests/scripts/pulp_gem/test_publication.sh | 14 ++++++------ tests/scripts/pulp_gem/test_sync.sh | 24 ++++++++++----------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tests/scripts/pulp_gem/test_content.sh b/tests/scripts/pulp_gem/test_content.sh index edadeb3..73c0c0e 100755 --- a/tests/scripts/pulp_gem/test_content.sh +++ b/tests/scripts/pulp_gem/test_content.sh @@ -8,8 +8,8 @@ pulp debug has-plugin --name "gem" || exit 23 cleanup() { rm "amber-1.0.0.gem" - pulp gem repository destroy --name "cli_test_gem_repository" || true - pulp gem repository destroy --name "cli_test_gem_upload_repository" || true + pulp gem repository destroy --name "cli_test_gem_content_repository" || true + pulp gem repository destroy --name "cli_test_gem_content_upload_repository" || true pulp orphan cleanup --protection-time 0 || true } trap cleanup EXIT @@ -18,15 +18,15 @@ trap cleanup EXIT wget "https://fixtures.pulpproject.org/gem/gems/amber-1.0.0.gem" sha256=$(sha256sum "amber-1.0.0.gem" | cut -d' ' -f1) -expect_succ pulp gem repository create --name "cli_test_gem_upload_repository" -expect_succ pulp gem content upload --file "amber-1.0.0.gem" --repository "cli_test_gem_upload_repository" +expect_succ pulp gem repository create --name "cli_test_gem_content_upload_repository" +expect_succ pulp gem content upload --file "amber-1.0.0.gem" --repository "cli_test_gem_content_upload_repository" expect_succ pulp artifact list --sha256 "$sha256" expect_succ pulp gem content list --checksum "$sha256" content_href="$(echo "$OUTPUT" | tr '\r\n' ' ' | jq -r .[0].pulp_href)" expect_succ pulp gem content show --href "$content_href" -expect_succ pulp gem repository create --name "cli_test_gem_repository" -expect_succ pulp gem repository content add --repository "cli_test_gem_repository" --href "$content_href" -expect_succ pulp gem repository content remove --repository "cli_test_gem_repository" --checksum "$sha256" -expect_succ pulp gem repository content modify --repository "cli_test_gem_repository" --add-content "[{\"checksum\":\"$sha256\"}]" -expect_succ pulp gem repository content list --repository "cli_test_gem_repository" +expect_succ pulp gem repository create --name "cli_test_gem_content_repository" +expect_succ pulp gem repository content add --repository "cli_test_gem_content_repository" --href "$content_href" +expect_succ pulp gem repository content remove --repository "cli_test_gem_content_repository" --checksum "$sha256" +expect_succ pulp gem repository content modify --repository "cli_test_gem_content_repository" --add-content "[{\"checksum\":\"$sha256\"}]" +expect_succ pulp gem repository content list --repository "cli_test_gem_content_repository" diff --git a/tests/scripts/pulp_gem/test_distribution.sh b/tests/scripts/pulp_gem/test_distribution.sh index 2e59215..ef9b285 100755 --- a/tests/scripts/pulp_gem/test_distribution.sh +++ b/tests/scripts/pulp_gem/test_distribution.sh @@ -7,8 +7,8 @@ set -eu pulp debug has-plugin --name "gem" || exit 23 cleanup() { - pulp gem repository destroy --name "cli_test_gem_repository" || true - pulp gem remote destroy --name "cli_test_gem_remote" || true + pulp gem repository destroy --name "cli_test_gem_dist_repository" || true + pulp gem remote destroy --name "cli_test_gem_dist_remote" || true pulp gem distribution destroy --name "cli_test_gem_distro" || true pulp orphan cleanup || true } @@ -21,10 +21,10 @@ else curl_opt="" fi -expect_succ pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL" -expect_succ pulp gem repository create --name "cli_test_gem_repository" -expect_succ pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" -expect_succ pulp gem publication create --repository "cli_test_gem_repository" +expect_succ pulp gem remote create --name "cli_test_gem_dist_remote" --url "$GEM_REMOTE_URL" +expect_succ pulp gem repository create --name "cli_test_gem_dist_repository" +expect_succ pulp gem repository sync --repository "cli_test_gem_dist_repository" --remote "cli_test_gem_dist_remote" +expect_succ pulp gem publication create --repository "cli_test_gem_dist_repository" PUBLICATION_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) expect_succ pulp gem distribution create \ @@ -42,9 +42,9 @@ expect_succ pulp gem distribution update \ expect_succ pulp gem distribution update \ --distribution "cli_test_gem_distro" \ --base-path "wrong_path" \ - --repository "cli_test_gem_repository" + --repository "cli_test_gem_dist_repository" expect_succ pulp gem distribution update \ --distribution "cli_test_gem_distro" \ - --remote "cli_test_gem_remote" + --remote "cli_test_gem_dist_remote" expect_succ pulp gem distribution destroy --distribution "cli_test_gem_distro" diff --git a/tests/scripts/pulp_gem/test_publication.sh b/tests/scripts/pulp_gem/test_publication.sh index 0f60ce3..e804e66 100755 --- a/tests/scripts/pulp_gem/test_publication.sh +++ b/tests/scripts/pulp_gem/test_publication.sh @@ -7,19 +7,19 @@ set -eu pulp debug has-plugin --name "gem" || exit 23 cleanup() { - pulp gem repository destroy --name "cli_test_gem_repository" || true - pulp gem remote destroy --name "cli_test_gem_remote" || true + pulp gem repository destroy --name "cli_test_gem_pub_repository" || true + pulp gem remote destroy --name "cli_test_gem_pub_remote" || true pulp orphan cleanup || true } trap cleanup EXIT -pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL" -pulp gem repository create --name "cli_test_gem_repository" -pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" +pulp gem remote create --name "cli_test_gem_pub_remote" --url "$GEM_REMOTE_URL" +pulp gem repository create --name "cli_test_gem_pub_repository" +pulp gem repository sync --repository "cli_test_gem_pub_repository" --remote "cli_test_gem_pub_remote" -expect_succ pulp gem publication create --repository "cli_test_gem_repository" +expect_succ pulp gem publication create --repository "cli_test_gem_pub_repository" PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp gem publication destroy --href "$PUBLICATION_HREF" -expect_succ pulp gem publication create --repository "cli_test_gem_repository" --version 0 +expect_succ pulp gem publication create --repository "cli_test_gem_pub_repository" --version 0 PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp gem publication destroy --href "$PUBLICATION_HREF" diff --git a/tests/scripts/pulp_gem/test_sync.sh b/tests/scripts/pulp_gem/test_sync.sh index 5d9b092..a151f28 100755 --- a/tests/scripts/pulp_gem/test_sync.sh +++ b/tests/scripts/pulp_gem/test_sync.sh @@ -7,8 +7,8 @@ set -eu pulp debug has-plugin --name "gem" || exit 23 cleanup() { - pulp gem repository destroy --name "cli_test_gem_repository" || true - pulp gem remote destroy --name "cli_test_gem_remote" || true + pulp gem repository destroy --name "cli_test_gem_sync_repository" || true + pulp gem remote destroy --name "cli_test_gem_sync_remote" || true pulp orphan cleanup || true } trap cleanup EXIT @@ -16,26 +16,26 @@ trap cleanup EXIT cleanup # Prepare -expect_succ pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL" -expect_succ pulp gem repository create --name "cli_test_gem_repository" +expect_succ pulp gem remote create --name "cli_test_gem_sync_remote" --url "$GEM_REMOTE_URL" +expect_succ pulp gem repository create --name "cli_test_gem_sync_repository" # Test without remote (should fail) -expect_fail pulp gem repository sync --repository "cli_test_gem_repository" +expect_fail pulp gem repository sync --repository "cli_test_gem_sync_repository" # Test with remote -expect_succ pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" +expect_succ pulp gem repository sync --repository "cli_test_gem_sync_repository" --remote "cli_test_gem_sync_remote" if pulp debug has-plugin --name "gem" --specifier ">=0.1.0" then # Preconfigure remote - expect_succ pulp gem repository update --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" + expect_succ pulp gem repository update --repository "cli_test_gem_sync_repository" --remote "cli_test_gem_sync_remote" # Test with remote - expect_succ pulp gem repository sync --repository "cli_test_gem_repository" + expect_succ pulp gem repository sync --repository "cli_test_gem_sync_repository" fi # Verify sync -expect_succ pulp gem repository version list --repository "cli_test_gem_repository" +expect_succ pulp gem repository version list --repository "cli_test_gem_sync_repository" expect_succ test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp gem repository version show --repository "cli_test_gem_repository" --version 1 +expect_succ pulp gem repository version show --repository "cli_test_gem_sync_repository" --version 1 if pulp debug has-plugin --name "gem" --specifier ">=0.1.1" then @@ -43,8 +43,8 @@ then fi # Test repair the version -expect_succ pulp gem repository version repair --repository "cli_test_gem_repository" --version 1 +expect_succ pulp gem repository version repair --repository "cli_test_gem_sync_repository" --version 1 expect_succ test "$(echo "$OUTPUT" | jq -r '.state')" = "completed" # Delete version again -expect_succ pulp gem repository version destroy --repository "cli_test_gem_repository" --version 1 +expect_succ pulp gem repository version destroy --repository "cli_test_gem_sync_repository" --version 1