Test gem count to exclude prereleases

[noissue]
pulp · Jun 29, 2023 · d224305 · d224305
1 parent 7b00a0a
commit d224305
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/tests/scripts/pulp_gem/test_repository.sh b/tests/scripts/pulp_gem/test_repository.sh
@@ -19,17 +19,17 @@ 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
   expect_succ pulp gem repository update --repository "cli_test_gem_repo" --description ""
 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
@@ -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