Skip ostree tests if pulpcore 3.39

theforeman · Nov 27, 2023 · 4aa3024 · 4aa3024
1 parent a7120dd
commit 4aa3024
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/bats/fb-katello-content.bats b/bats/fb-katello-content.bats
@@ -72,20 +72,23 @@ setup() {
 
 @test "create an ostree repository" {
   tSkipUnlessContentType 'ostree'
+  tSkipIfPulp339
 
   hammer repository create --organization="${ORGANIZATION}" --url=https://fixtures.pulpproject.org/ostree/small/ \
     --product="${PRODUCT}" --content-type="ostree" --name "${OSTREE_REPOSITORY}" | grep -q "Repository created"
 }
 
 @test "sync ostree repository" {
   tSkipUnlessContentType 'ostree'
+  tSkipIfPulp339
 
   hammer repository synchronize --organization="${ORGANIZATION}" \
     --product="${PRODUCT}" --name="${OSTREE_REPOSITORY}"
 }
 
 @test "upload ostree_ref" {
   tSkipUnlessContentType 'ostree'
+  tSkipIfPulp339
 
   wget --no-parent -r https://fixtures.pulpproject.org/ostree/small/
   tDirectoryExists fixtures.pulpproject.org/ostree

diff --git a/bats/foreman_helper.bash b/bats/foreman_helper.bash
@@ -28,6 +28,12 @@ tKatelloVersion() {
   ) | cut -d. -f1-2
 }
 
+tSkipIfPulp39() {
+  if tPackageExists python3.11-pulpcore; then
+    skip "Skipping on Pulpcore 3.9 until https://github.com/pulp/pulpcore/issues/4777 is fixed"
+  fi
+}
+
 tIsVersionNewer() {
   GIVEN_VERSION="$1"
   WANTED_VERSION="$2"