Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop test skipping on Pulp 3.39 #1771

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Drop test skipping on Pulp 3.39 #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions bats/fb-katello-content.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ setup() {
}

@test "export content view version" {
tSkipIfPulp339

hammer content-export complete version --organization="${ORGANIZATION}" \
--content-view="${CONTENT_VIEW}" --version="1.0"
export_version_id=$(hammer --output csv --no-headers content-view version show --version="1.0" --content-view="${CONTENT_VIEW}" --organization="${ORGANIZATION}" \
Expand All @@ -138,8 +136,6 @@ setup() {
}

@test "import the exported content view" {
tSkipIfPulp339

latest_export=$(hammer --output csv --no-headers content-export list --content-view "${CONTENT_VIEW}" --organization "${ORGANIZATION}"\
--content-view-version="1.0" --fields="Id,Path" --per-page=1 --order="id DESC")
# 16,,/var/lib/pulp/exports/Test_Organization/Test_CV/1.0/2020-12-11T16-04-08-00-00,Test CV 1.0,6,2020-12-11 16:04:12 UTC,2020-12-11 16:04:12 UTC
Expand Down Expand Up @@ -168,8 +164,6 @@ setup() {
}

@test "compare contents of export and import" {
tSkipIfPulp339

export_version=$(hammer --output csv --no-headers content-view version list --content-view="${CONTENT_VIEW}" --organization="${ORGANIZATION}"\
--per-page=1 --fields="Version" --order="version DESC")
hammer --output csv --no-headers content-view version show --content-view="${CONTENT_VIEW}" --organization="${ORGANIZATION}" \
Expand All @@ -181,8 +175,6 @@ setup() {
}

@test "export the library" {
tSkipIfPulp339

hammer content-export complete library --organization="${ORGANIZATION}"
export_version_id=$(hammer --output csv --no-headers content-view version list --content-view="${LIBRARY}" --organization="${ORGANIZATION}" \
--fields=id --per-page=1 --order="version DESC")
Expand All @@ -196,8 +188,6 @@ setup() {
}

@test "import the library to the new organization" {
tSkipIfPulp339

latest_export=$(hammer --output csv --no-headers content-export list --content-view "${LIBRARY}" --organization "${ORGANIZATION}"\
--fields="Id,Path" --per-page=1 --order="id DESC")
export_history_id=$(echo $latest_export | cut -d, -f1) # 16
Expand All @@ -213,8 +203,6 @@ setup() {
}

@test "compare contents of library export and import" {
tSkipIfPulp339

export_version=$(hammer --output csv --no-headers content-view version list --content-view="${LIBRARY}" --organization="${ORGANIZATION}"\
--per-page=1 --fields="Version" --order="version DESC")
hammer --output csv --no-headers content-view version show --content-view="${LIBRARY}" --organization="${ORGANIZATION}" \
Expand All @@ -232,8 +220,6 @@ setup() {
}

@test "perform an incremental export" {
tSkipIfPulp339

export_version_id=$(hammer --output csv --no-headers content-view version list --content-view="${CONTENT_VIEW}" --organization="${ORGANIZATION}" \
--fields=id --per-page=1 --order="version DESC")

Expand All @@ -245,8 +231,6 @@ setup() {
}

@test "perform an incremental library export" {
tSkipIfPulp339

hammer content-export incremental library --organization="${ORGANIZATION}"

export_version_id=$(hammer --output csv --no-headers content-view version list --content-view="${LIBRARY}" --organization="${ORGANIZATION}" \
Expand Down
6 changes: 0 additions & 6 deletions bats/foreman_helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ tKatelloVersion() {
) | cut -d. -f1-2
}

tSkipIfPulp339() {
if tPackageExists python3.11-pulpcore; then
skip "Skipping on Pulpcore 3.39 until https://github.com/pulp/pulpcore/issues/4777 is fixed"
fi
}

tIsVersionNewer() {
GIVEN_VERSION="$1"
WANTED_VERSION="$2"
Expand Down
Loading