From d2243055df3c91a4316d335efac72f042005f6bf Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Thu, 29 Jun 2023 21:07:07 +0200 Subject: [PATCH] Test gem count to exclude prereleases [noissue] --- tests/scripts/pulp_gem/test_repository.sh | 8 ++++---- tests/scripts/pulp_gem/test_sync.sh | 12 +++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/scripts/pulp_gem/test_repository.sh b/tests/scripts/pulp_gem/test_repository.sh index ac972cc..1483c6b 100755 --- a/tests/scripts/pulp_gem/test_repository.sh +++ b/tests/scripts/pulp_gem/test_repository.sh @@ -19,8 +19,8 @@ expect_succ pulp gem repository list expect_succ pulp gem repository create --name "cli_test_gem_repo" --description "Test repository for CLI tests" ## Use this version only after switching to pulp-cli >= 0.20 -# if pulp debug has-plugin --name "gem" --specifier ">=0.0.1.dev" -if pulp debug has-plugin --name "gem" --min-version "0.0.1.dev" +# if pulp debug has-plugin --name "gem" --specifier ">=0.1.0" +if pulp debug has-plugin --name "gem" --min-version "0.1.0" then expect_succ pulp gem repository update --repository "cli_test_gem_repo" --description "" --remote "cli_test_gem_remote1" else @@ -28,8 +28,8 @@ else fi expect_succ pulp gem repository show --repository "cli_test_gem_repo" ## Use this version only after switching to pulp-cli >= 0.20 -# if pulp debug has-plugin --name "gem" --specifier ">=0.0.1.dev" -if pulp debug has-plugin --name "gem" --min-version "0.0.1.dev" +# if pulp debug has-plugin --name "gem" --specifier ">=0.1.0" +if pulp debug has-plugin --name "gem" --min-version "0.1.0" then expect_succ test "$(echo "$OUTPUT" | jq -r '.remote')" = "$REMOTE1_HREF" expect_succ pulp gem repository update --repository "cli_test_gem_repo" --remote "$REMOTE2_HREF" diff --git a/tests/scripts/pulp_gem/test_sync.sh b/tests/scripts/pulp_gem/test_sync.sh index c7e830b..7e51ee2 100755 --- a/tests/scripts/pulp_gem/test_sync.sh +++ b/tests/scripts/pulp_gem/test_sync.sh @@ -24,8 +24,8 @@ expect_fail pulp gem repository sync --repository "cli_test_gem_repository" expect_succ pulp gem repository sync --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" ## Use this version only after switching to pulp-cli >= 0.20 -# if pulp debug has-plugin --name "gem" --specifier ">=0.0.1.dev" -if pulp debug has-plugin --name "gem" --min-version "0.0.1.dev" +# if pulp debug has-plugin --name "gem" --specifier ">=0.1.0" +if pulp debug has-plugin --name "gem" --min-version "0.1.0" then # Preconfigure remote expect_succ pulp gem repository update --repository "cli_test_gem_repository" --remote "cli_test_gem_remote" @@ -37,7 +37,13 @@ fi expect_succ pulp gem repository version list --repository "cli_test_gem_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 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."gem.gem".count')" -eq 6 + +## Use this version only after switching to pulp-cli >= 0.20 +# if pulp debug has-plugin --name "gem" --specifier ">=0.1.1" +if pulp debug has-plugin --name "gem" --min-version "0.1.1" +then + expect_succ test "$(echo "$OUTPUT" | jq -r '.content_summary.present."gem.gem".count')" -eq 4 +fi # Test repair the version expect_succ pulp gem repository version repair --repository "cli_test_gem_repository" --version 1