From d57b62c4bc65e2e12f430f9ed90bf653e729d1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Thu, 15 Jun 2023 14:39:18 +0200 Subject: [PATCH] createrepo_c: update test to new groupfile unification For: https://github.com/rpm-software-management/createrepo_c/pull/373 --- dnf-behave-tests/createrepo_c/compression.feature | 1 - .../createrepo_c/empty-repository.feature | 12 ------------ .../createrepo_c/update-keep-all-metadata.feature | 7 ------- dnf-behave-tests/createrepo_c/update.feature | 1 - 4 files changed, 21 deletions(-) diff --git a/dnf-behave-tests/createrepo_c/compression.feature b/dnf-behave-tests/createrepo_c/compression.feature index 894dd7a7e..3eea055f2 100644 --- a/dnf-behave-tests/createrepo_c/compression.feature +++ b/dnf-behave-tests/createrepo_c/compression.feature @@ -45,7 +45,6 @@ Given I create file "/groupfile.xml" with | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_zstd | ${checksum}-groupfile.xml.gz | sha256 | gz | And primary in "/repodata/" doesn't have any packages diff --git a/dnf-behave-tests/createrepo_c/empty-repository.feature b/dnf-behave-tests/createrepo_c/empty-repository.feature index 1ed728b1d..35fca93b7 100644 --- a/dnf-behave-tests/createrepo_c/empty-repository.feature +++ b/dnf-behave-tests/createrepo_c/empty-repository.feature @@ -70,7 +70,6 @@ Scenario: Repo with --groupfile | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | @@ -83,7 +82,6 @@ Scenario: Repo with --groupfile and --checksum sha | primary | ${checksum}-primary.xml.zst | sha224 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha224 | zstd | | other | ${checksum}-other.xml.zst | sha224 | zstd | - | group | ${checksum}-groupfile.xml | sha224 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha224 | zstd | @@ -96,7 +94,6 @@ Scenario: Repo with --simple-md-filenames and --groupfile | primary | primary.xml.zst | sha256 | zstd | | filelists | filelists.xml.zst | sha256 | zstd | | other | other.xml.zst | sha256 | zstd | - | group | groupfile.xml | sha256 | - | | group_gz | groupfile.xml.zst | sha256 | zstd | @@ -109,7 +106,6 @@ Scenario: Repo with --unique-md-filenames and --groupfile | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | @@ -122,7 +118,6 @@ Scenario: Repo with --xz compression and --groupfile | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_xz | ${checksum}-groupfile.xml.xz | sha256 | xz | @@ -135,7 +130,6 @@ Scenario: Repo with --compress-type bz2 and --groupfile | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_bz2 | ${checksum}-groupfile.xml.bz2 | sha256 | bz2 | @@ -148,7 +142,6 @@ Scenario: Repo with --compress-type gz | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.gz | sha256 | gz | @@ -161,7 +154,6 @@ Scenario: Repo with --compress-type xz | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_xz | ${checksum}-groupfile.xml.xz | sha256 | xz | @@ -174,7 +166,6 @@ Scenario: Repo with --repomd-checksum and --groupfile | primary | ${checksum}-primary.xml.zst | sha224 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha224 | zstd | | other | ${checksum}-other.xml.zst | sha224 | zstd | - | group | ${checksum}-groupfile.xml | sha224 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha224 | zstd | @@ -187,7 +178,6 @@ Scenario: Repo with --checksum --repomd-checksum and --groupfile | primary | ${checksum}-primary.xml.zst | sha512 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha512 | zstd | | other | ${checksum}-other.xml.zst | sha512 | zstd | - | group | ${checksum}-groupfile.xml | sha512 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha512 | zstd | @@ -200,7 +190,6 @@ Scenario: Repo with --general-compress-type and --groupfile | primary | ${checksum}-primary.xml.xz | sha256 | xz | | filelists | ${checksum}-filelists.xml.xz | sha256 | xz | | other | ${checksum}-other.xml.xz | sha256 | xz | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_xz | ${checksum}-groupfile.xml.xz | sha256 | xz | @@ -213,7 +202,6 @@ Scenario: Repo without compression and --groupfile | primary | ${checksum}-primary.xml.xz | sha256 | xz | | filelists | ${checksum}-filelists.xml.xz | sha256 | xz | | other | ${checksum}-other.xml.xz | sha256 | xz | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_xz | ${checksum}-groupfile.xml.xz | sha256 | xz | diff --git a/dnf-behave-tests/createrepo_c/update-keep-all-metadata.feature b/dnf-behave-tests/createrepo_c/update-keep-all-metadata.feature index ffca0eb65..38ea5c606 100644 --- a/dnf-behave-tests/createrepo_c/update-keep-all-metadata.feature +++ b/dnf-behave-tests/createrepo_c/update-keep-all-metadata.feature @@ -64,7 +64,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | When I execute createrepo_c with args "--update --discard-additional-metadata ." in "/temp-repo" Then the exit code is 0 @@ -89,7 +88,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | | updateinfo | ${checksum}-updateinfo.xml.zst | sha256 | zstd | | custom_metadata | ${checksum}-custom_metadata.txt.zst| sha256 | zstd | @@ -107,7 +105,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile2.xml | sha256 | - | | group_gz | ${checksum}-groupfile2.xml.zst | sha256 | zstd | | custom_metadata | ${checksum}-custom_metadata.txt.zst| sha256 | zstd | @@ -128,7 +125,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | filelists_zck | ${checksum}-filelists.xml.zck | sha256 | zck | | other | ${checksum}-other.xml.zst | sha256 | zstd | | other_zck | ${checksum}-other.xml.zck | sha256 | zck | - | group | ${checksum}-groupfile2.xml | sha256 | - | | group_gz | ${checksum}-groupfile2.xml.zst | sha256 | zstd | | group_zck | ${checksum}-groupfile2.xml.zck | sha256 | zck | | custom_metadata | ${checksum}-custom_metadata.txt.zst | sha256 | zstd | @@ -148,7 +144,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml --zck ." in | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | | group_zck | ${checksum}-groupfile.xml.zck | sha256 | zck | | custom_metadata | ${checksum}-custom_metadata.txt.zst | sha256 | zstd | @@ -198,7 +193,6 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | | updateinfo | ${checksum}-updateinfo.xml.zst | sha256 | zstd | | custom_metadata | ${checksum}-custom_metadata.txt.zst| sha256 | zstd | @@ -285,6 +279,5 @@ Given I execute createrepo_c with args "--groupfile ../groupfile.xml ." in "/tem | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_gz | ${checksum}-groupfile.xml.zst | sha256 | zstd | | custom_metadata | ${checksum}-custom_metadata.txt.zst | sha256 | zstd | diff --git a/dnf-behave-tests/createrepo_c/update.feature b/dnf-behave-tests/createrepo_c/update.feature index b364bf8e6..a1e499312 100644 --- a/dnf-behave-tests/createrepo_c/update.feature +++ b/dnf-behave-tests/createrepo_c/update.feature @@ -51,7 +51,6 @@ Given I create directory "/empty-repo/" | primary | ${checksum}-primary.xml.zst | sha256 | zstd | | filelists | ${checksum}-filelists.xml.zst | sha256 | zstd | | other | ${checksum}-other.xml.zst | sha256 | zstd | - | group | ${checksum}-groupfile.xml | sha256 | - | | group_zst | ${checksum}-groupfile.xml.zst | sha256 | zstd | When I execute createrepo_c with args "--update ." in "/empty-repo" Then the exit code is 0