Skip to content

Commit 94ce0b4

Browse files
jobselkojobselko
committed
Fix parallel CLI test name collisions
Assisted By: Claude Opus 4.6 (cherry picked from commit 8bb46ed)
1 parent 44b13f6 commit 94ce0b4

4 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎tests/scripts/pulp_gem/test_content.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pulp debug has-plugin --name "gem" || exit 23
88

99
cleanup() {
1010
rm "amber-1.0.0.gem"
11-
pulp gem repository destroy --name "cli_test_gem_repository" || true
12-
pulp gem repository destroy --name "cli_test_gem_upload_repository" || true
11+
pulp gem repository destroy --name "cli_test_gem_content_repository" || true
12+
pulp gem repository destroy --name "cli_test_gem_content_upload_repository" || true
1313
pulp orphan cleanup --protection-time 0 || true
1414
}
1515
trap cleanup EXIT
@@ -18,15 +18,15 @@ trap cleanup EXIT
1818
wget "https://fixtures.pulpproject.org/gem/gems/amber-1.0.0.gem"
1919
sha256=$(sha256sum "amber-1.0.0.gem" | cut -d' ' -f1)
2020

21-
expect_succ pulp gem repository create --name "cli_test_gem_upload_repository"
22-
expect_succ pulp gem content upload --file "amber-1.0.0.gem" --repository "cli_test_gem_upload_repository"
21+
expect_succ pulp gem repository create --name "cli_test_gem_content_upload_repository"
22+
expect_succ pulp gem content upload --file "amber-1.0.0.gem" --repository "cli_test_gem_content_upload_repository"
2323
expect_succ pulp artifact list --sha256 "$sha256"
2424
expect_succ pulp gem content list --checksum "$sha256"
2525
content_href="$(echo "$OUTPUT" | tr '\r\n' ' ' | jq -r .[0].pulp_href)"
2626
expect_succ pulp gem content show --href "$content_href"
2727

28-
expect_succ pulp gem repository create --name "cli_test_gem_repository"
29-
expect_succ pulp gem repository content add --repository "cli_test_gem_repository" --href "$content_href"
30-
expect_succ pulp gem repository content remove --repository "cli_test_gem_repository" --checksum "$sha256"
31-
expect_succ pulp gem repository content modify --repository "cli_test_gem_repository" --add-content "[{\"checksum\":\"$sha256\"}]"
32-
expect_succ pulp gem repository content list --repository "cli_test_gem_repository"
28+
expect_succ pulp gem repository create --name "cli_test_gem_content_repository"
29+
expect_succ pulp gem repository content add --repository "cli_test_gem_content_repository" --href "$content_href"
30+
expect_succ pulp gem repository content remove --repository "cli_test_gem_content_repository" --checksum "$sha256"
31+
expect_succ pulp gem repository content modify --repository "cli_test_gem_content_repository" --add-content "[{\"checksum\":\"$sha256\"}]"
32+
expect_succ pulp gem repository content list --repository "cli_test_gem_content_repository"

‎tests/scripts/pulp_gem/test_distribution.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set -eu
77
pulp debug has-plugin --name "gem" || exit 23
88

99
cleanup() {
10-
pulp gem repository destroy --name "cli_test_gem_repository" || true
11-
pulp gem remote destroy --name "cli_test_gem_remote" || true
10+
pulp gem repository destroy --name "cli_test_gem_dist_repository" || true
11+
pulp gem remote destroy --name "cli_test_gem_dist_remote" || true
1212
pulp gem distribution destroy --name "cli_test_gem_distro" || true
1313
pulp orphan cleanup || true
1414
}
@@ -21,10 +21,10 @@ else
2121
curl_opt=""
2222
fi
2323

24-
expect_succ pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL"
25-
expect_succ pulp gem repository create --name "cli_test_gem_repository"
26-
expect_succ pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote"
27-
expect_succ pulp gem publication create --repository "cli_test_gem_repository"
24+
expect_succ pulp gem remote create --name "cli_test_gem_dist_remote" --url "$GEM_REMOTE_URL"
25+
expect_succ pulp gem repository create --name "cli_test_gem_dist_repository"
26+
expect_succ pulp gem repository sync --repository "cli_test_gem_dist_repository" --remote "cli_test_gem_dist_remote"
27+
expect_succ pulp gem publication create --repository "cli_test_gem_dist_repository"
2828
PUBLICATION_HREF=$(echo "$OUTPUT" | jq -r .pulp_href)
2929

3030
expect_succ pulp gem distribution create \
@@ -42,9 +42,9 @@ expect_succ pulp gem distribution update \
4242
expect_succ pulp gem distribution update \
4343
--distribution "cli_test_gem_distro" \
4444
--base-path "wrong_path" \
45-
--repository "cli_test_gem_repository"
45+
--repository "cli_test_gem_dist_repository"
4646
expect_succ pulp gem distribution update \
4747
--distribution "cli_test_gem_distro" \
48-
--remote "cli_test_gem_remote"
48+
--remote "cli_test_gem_dist_remote"
4949

5050
expect_succ pulp gem distribution destroy --distribution "cli_test_gem_distro"

‎tests/scripts/pulp_gem/test_publication.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ set -eu
77
pulp debug has-plugin --name "gem" || exit 23
88

99
cleanup() {
10-
pulp gem repository destroy --name "cli_test_gem_repository" || true
11-
pulp gem remote destroy --name "cli_test_gem_remote" || true
10+
pulp gem repository destroy --name "cli_test_gem_pub_repository" || true
11+
pulp gem remote destroy --name "cli_test_gem_pub_remote" || true
1212
pulp orphan cleanup || true
1313
}
1414
trap cleanup EXIT
1515

16-
pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL"
17-
pulp gem repository create --name "cli_test_gem_repository"
18-
pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote"
16+
pulp gem remote create --name "cli_test_gem_pub_remote" --url "$GEM_REMOTE_URL"
17+
pulp gem repository create --name "cli_test_gem_pub_repository"
18+
pulp gem repository sync --repository "cli_test_gem_pub_repository" --remote "cli_test_gem_pub_remote"
1919

20-
expect_succ pulp gem publication create --repository "cli_test_gem_repository"
20+
expect_succ pulp gem publication create --repository "cli_test_gem_pub_repository"
2121
PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)"
2222
expect_succ pulp gem publication destroy --href "$PUBLICATION_HREF"
23-
expect_succ pulp gem publication create --repository "cli_test_gem_repository" --version 0
23+
expect_succ pulp gem publication create --repository "cli_test_gem_pub_repository" --version 0
2424
PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)"
2525
expect_succ pulp gem publication destroy --href "$PUBLICATION_HREF"

‎tests/scripts/pulp_gem/test_sync.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,44 @@ set -eu
77
pulp debug has-plugin --name "gem" || exit 23
88

99
cleanup() {
10-
pulp gem repository destroy --name "cli_test_gem_repository" || true
11-
pulp gem remote destroy --name "cli_test_gem_remote" || true
10+
pulp gem repository destroy --name "cli_test_gem_sync_repository" || true
11+
pulp gem remote destroy --name "cli_test_gem_sync_remote" || true
1212
pulp orphan cleanup || true
1313
}
1414
trap cleanup EXIT
1515

1616
cleanup
1717

1818
# Prepare
19-
expect_succ pulp gem remote create --name "cli_test_gem_remote" --url "$GEM_REMOTE_URL"
20-
expect_succ pulp gem repository create --name "cli_test_gem_repository"
19+
expect_succ pulp gem remote create --name "cli_test_gem_sync_remote" --url "$GEM_REMOTE_URL"
20+
expect_succ pulp gem repository create --name "cli_test_gem_sync_repository"
2121

2222
# Test without remote (should fail)
23-
expect_fail pulp gem repository sync --repository "cli_test_gem_repository"
23+
expect_fail pulp gem repository sync --repository "cli_test_gem_sync_repository"
2424
# Test with remote
25-
expect_succ pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote"
25+
expect_succ pulp gem repository sync --repository "cli_test_gem_sync_repository" --remote "cli_test_gem_sync_remote"
2626

2727
if pulp debug has-plugin --name "gem" --specifier ">=0.1.0"
2828
then
2929
# Preconfigure remote
30-
expect_succ pulp gem repository update --repository "cli_test_gem_repository" --remote "cli_test_gem_remote"
30+
expect_succ pulp gem repository update --repository "cli_test_gem_sync_repository" --remote "cli_test_gem_sync_remote"
3131
# Test with remote
32-
expect_succ pulp gem repository sync --repository "cli_test_gem_repository"
32+
expect_succ pulp gem repository sync --repository "cli_test_gem_sync_repository"
3333
fi
3434

3535
# Verify sync
36-
expect_succ pulp gem repository version list --repository "cli_test_gem_repository"
36+
expect_succ pulp gem repository version list --repository "cli_test_gem_sync_repository"
3737
expect_succ test "$(echo "$OUTPUT" | jq -r length)" -eq 2
38-
expect_succ pulp gem repository version show --repository "cli_test_gem_repository" --version 1
38+
expect_succ pulp gem repository version show --repository "cli_test_gem_sync_repository" --version 1
3939

4040
if pulp debug has-plugin --name "gem" --specifier ">=0.1.1"
4141
then
4242
expect_succ test "$(echo "$OUTPUT" | jq -r '.content_summary.present."gem.gem".count')" -eq 4
4343
fi
4444

4545
# Test repair the version
46-
expect_succ pulp gem repository version repair --repository "cli_test_gem_repository" --version 1
46+
expect_succ pulp gem repository version repair --repository "cli_test_gem_sync_repository" --version 1
4747
expect_succ test "$(echo "$OUTPUT" | jq -r '.state')" = "completed"
4848

4949
# Delete version again
50-
expect_succ pulp gem repository version destroy --repository "cli_test_gem_repository" --version 1
50+
expect_succ pulp gem repository version destroy --repository "cli_test_gem_sync_repository" --version 1

0 commit comments

Comments
 (0)