Skip to content

Commit ed124cf

Browse files
fhbashfhbash
committed
Fixes test to check epoch in package name
Signed-off-by: Fellipe Henrique <[email protected]>
1 parent 4673ab4 commit ed124cf

38 files changed

+151
-317
lines changed

‎dnf-behave-tests/dnf/check-dependencies.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Feature: Check when there is a package with missing dependency
22

33

44
Scenario Outline: Check <option>
5-
When I execute rpm with args "-i --nodeps {context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-3.9-2.fc29.x86_64.rpm"
5+
When I execute rpm with args "-i --nodeps {context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-0:3.9-2.fc29.x86_64.rpm"
66
Then the exit code is 0
77
When I execute dnf with args "check <option>"
88
Then the exit code is 1
@@ -24,7 +24,7 @@ Examples:
2424

2525

2626
Scenario Outline: Check <option>
27-
When I execute rpm with args "-i --nodeps {context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-3.9-2.fc29.x86_64.rpm"
27+
When I execute rpm with args "-i --nodeps {context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-0:3.9-2.fc29.x86_64.rpm"
2828
Then the exit code is 0
2929
When I execute dnf with args "check <option>"
3030
Then the exit code is 0

‎dnf-behave-tests/dnf/comps-group.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ Scenario: Install and remove group with excluded package dependency
126126
"""
127127
<REPOSYNC>
128128
Failed to resolve the transaction:
129-
Problem: package filesystem-3.9-2.fc29.x86_64 from dnf-ci-fedora requires setup, but none of the providers can be installed
129+
Problem: package filesystem-0:3.9-2.fc29.x86_64 from dnf-ci-fedora requires setup, but none of the providers can be installed
130130
- conflicting requests
131-
- package setup-2.12.1-1.fc29.noarch from dnf-ci-fedora is filtered out by exclude filtering
131+
- package setup-0:2.12.1-1.fc29.noarch from dnf-ci-fedora is filtered out by exclude filtering
132132
You can try to add to command line:
133133
--skip-broken to skip uninstallable packages
134134
"""

‎dnf-behave-tests/dnf/do-from-repo.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ Scenario: Test reinstall,upgrade,install; one transaction; each action different
112112
Then the exit code is 0
113113
And Transaction is following
114114
| Action | Package |
115-
| install | lame-3.100-4.fc29.x86_64 |
115+
| install | lame-0:3.100-4.fc29.x86_64 |
116116
| upgrade | abcde-0:2.9.3-1.fc29.noarch |
117117
| upgrade | flac-0:1.3.3-1.fc29.x86_64 |
118118
| upgrade | pkgB-0:1.1-1.fc29.x86_64 |
119119
| upgrade | wget-0:1.19.6-5.fc29.x86_64 |
120120
| install-dep | dependency2-0:1.0-1.fc29.x86_64 |
121-
| install-dep | lame-libs-3.100-4.fc29.x86_64 |
121+
| install-dep | lame-libs-0:3.100-4.fc29.x86_64 |
122122
| reinstall | basesystem-0:12-2.fc29.noarch |
123123
| reinstall | setup-0:2.14.2-1.fc29.noarch |

‎dnf-behave-tests/dnf/downgrade.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ Scenario: Downgrade RPM that requires downgrade of dependency
5252
And package state is
5353
| package | reason | from_repo |
5454
| basesystem-11-6.fc29.noarch | Dependency | dnf-ci-fedora |
55-
| filesystem-3.9-2.fc29.x86_64 | Dependency | dnf-ci-fedora |
55+
| filesystem-0:3.9-2.fc29.x86_64 | Dependency | dnf-ci-fedora |
5656
| glibc-2.28-9.fc29.x86_64 | User | dnf-ci-fedora |
5757
| glibc-all-langpacks-2.28-9.fc29.x86_64 | Dependency | dnf-ci-fedora |
5858
| glibc-common-2.28-9.fc29.x86_64 | Dependency | dnf-ci-fedora |
59-
| setup-2.12.1-1.fc29.noarch | Dependency | dnf-ci-fedora |
59+
| setup-0:2.12.1-1.fc29.noarch | Dependency | dnf-ci-fedora |
6060
And dnf5 transaction items for transaction "last" are
6161
| action | package | reason | repository |
6262
| Downgrade | glibc-0:2.28-9.fc29.x86_64 | User | dnf-ci-fedora |

‎dnf-behave-tests/dnf/download-binary-xml-base.feature‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Given I copy repository "dnf-ci-fedora" for modification
99
And I copy directory "{context.dnf.repos[dnf-ci-fedora].path}" to "/xml_base/dnf-ci-fedora"
1010
When I execute dnf with args "download setup --destdir={context.dnf.tempdir}"
1111
Then the exit code is 0
12-
And file "/xml_base/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm" exists
12+
And file "/xml_base/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm" exists
1313
And file sha256 checksums are following
1414
| Path | sha256 |
15-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
15+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
1616

1717

1818
Scenario: Download from local repodata with xml:base pointing to remote packages
@@ -28,7 +28,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http
2828
Then the exit code is 0
2929
And file sha256 checksums are following
3030
| Path | sha256 |
31-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
31+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
3232

3333

3434
Scenario: Download from remote repodata with xml:base pointing to packages on different remote
@@ -44,7 +44,7 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http
4444
"""
4545
And file sha256 checksums are following
4646
| Path | sha256 |
47-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
47+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
4848

4949

5050
Scenario: Download to destdir from local repodata that have packages with xml:base pointing to a remote as well as local packages
@@ -64,5 +64,5 @@ Given I make packages from repository "dnf-ci-fedora" accessible via http
6464
"""
6565
And file sha256 checksums are following
6666
| Path | sha256 |
67-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
67+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
6868
| {context.dnf.tempdir}/alternator-1.1-1.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-thirdparty/x86_64/alternator-1.1-1.x86_64.rpm |

‎dnf-behave-tests/dnf/download-binary.feature‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Scenario: Download an existing RPM
2020
And stderr contains "setup-0:2.12.1-1.fc29.noarch"
2121
And file sha256 checksums are following
2222
| Path | sha256 |
23-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
23+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
2424

2525

2626
Scenario: Download an existing RPM with dependencies
@@ -30,8 +30,8 @@ Scenario: Download an existing RPM with dependencies
3030
And stderr contains "setup-0:2.12.1-1.fc29.noarch"
3131
And file sha256 checksums are following
3232
| Path | sha256 |
33-
| {context.dnf.tempdir}/filesystem-3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-3.9-2.fc29.x86_64.rpm |
34-
| {context.dnf.tempdir}/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
33+
| {context.dnf.tempdir}/filesystem-0:3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-0:3.9-2.fc29.x86_64.rpm |
34+
| {context.dnf.tempdir}/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
3535

3636

3737
@bz1844925
@@ -40,9 +40,9 @@ Scenario: Error when failed to resolve dependencies
4040
Then stderr contains lines
4141
"""
4242
Failed to resolve the transaction:
43-
Problem: package filesystem-3.9-2.fc29.x86_64 from dnf-ci-fedora requires setup, but none of the providers can be installed
43+
Problem: package filesystem-0:3.9-2.fc29.x86_64 from dnf-ci-fedora requires setup, but none of the providers can be installed
4444
- conflicting requests
45-
- package setup-2.12.1-1.fc29.noarch from dnf-ci-fedora is filtered out by exclude filtering
45+
- package setup-0:2.12.1-1.fc29.noarch from dnf-ci-fedora is filtered out by exclude filtering
4646
"""
4747
Then the exit code is 1
4848

@@ -54,8 +54,8 @@ Scenario: Download an existing RPM with dependencies into a --destdir
5454
And stderr contains "setup-0:2.12.1-1.fc29.noarch"
5555
And file sha256 checksums are following
5656
| Path | sha256 |
57-
| {context.dnf.tempdir}/downloaddir/filesystem-3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-3.9-2.fc29.x86_64.rpm |
58-
| {context.dnf.tempdir}/downloaddir/setup-2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm |
57+
| {context.dnf.tempdir}/downloaddir/filesystem-0:3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-0:3.9-2.fc29.x86_64.rpm |
58+
| {context.dnf.tempdir}/downloaddir/setup-0:2.12.1-1.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm |
5959

6060

6161
Scenario: Download an existing RPM with dependencies into a --destdir where a dependency is installed
@@ -68,12 +68,12 @@ Scenario: Download an existing RPM with dependencies into a --destdir where a de
6868
Then the exit code is 0
6969
And stderr contains "basesystem-0:11-6.fc29.noarch"
7070
And stderr contains "filesystem-0:3.9-2.fc29.x86_64"
71-
And stderr does not contain "setup-2.12.1-1.fc29.noarch"
71+
And stderr does not contain "setup-0:2.12.1-1.fc29.noarch"
7272
And file sha256 checksums are following
7373
| Path | sha256 |
7474
| {context.dnf.tempdir}/downloaddir/basesystem-11-6.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/basesystem-11-6.fc29.noarch.rpm |
75-
| {context.dnf.tempdir}/downloaddir/filesystem-3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-3.9-2.fc29.x86_64.rpm |
76-
| {context.dnf.tempdir}/downloaddir/setup-2.12.1-1.fc29.noarch.rpm | - |
75+
| {context.dnf.tempdir}/downloaddir/filesystem-0:3.9-2.fc29.x86_64.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/x86_64/filesystem-0:3.9-2.fc29.x86_64.rpm |
76+
| {context.dnf.tempdir}/downloaddir/setup-0:2.12.1-1.fc29.noarch.rpm | - |
7777

7878

7979
Scenario: Download an existing RPM with dependencies into a --destdir where all packages are already installed
@@ -92,8 +92,8 @@ Scenario: Download an existing RPM with dependencies into a --destdir where all
9292
And file sha256 checksums are following
9393
| Path | sha256 |
9494
| {context.dnf.tempdir}/downloaddir/basesystem-11-6.fc29.noarch.rpm | file://{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/basesystem-11-6.fc29.noarch.rpm |
95-
| {context.dnf.tempdir}/downloaddir/filesystem-3.9-2.fc29.x86_64.rpm | - |
96-
| {context.dnf.tempdir}/downloaddir/setup-2.12.1-1.fc29.noarch.rpm | - |
95+
| {context.dnf.tempdir}/downloaddir/filesystem-0:3.9-2.fc29.x86_64.rpm | - |
96+
| {context.dnf.tempdir}/downloaddir/setup-0:2.12.1-1.fc29.noarch.rpm | - |
9797

9898

9999
@bz1612874
@@ -112,6 +112,6 @@ Scenario: Download an existing RPM when there are multiple packages of the same
112112
And stderr does not contain "filesystem-0:3\.9-2\.fc29\.x86_64(.|\n)*filesystem-0:3\.9-2\.fc29\.x86_64"
113113
And stderr does not contain "wget-0:1\.19\.5-5\.fc29\.x86_64(.|\n)*wget-0:1\.19\.5-5\.fc29\.x86_64"
114114
# check that the files have been downloaded
115-
And file "downloaddir/setup-2.12.1-1.fc29.noarch.rpm" exists
116-
And file "downloaddir/filesystem-3.9-2.fc29.x86_64.rpm" exists
115+
And file "downloaddir/setup-0:2.12.1-1.fc29.noarch.rpm" exists
116+
And file "downloaddir/filesystem-0:3.9-2.fc29.x86_64.rpm" exists
117117
And file "downloaddir/wget-1.19.5-5.fc29.x86_64.rpm" exists

‎dnf-behave-tests/dnf/download-source.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Scenario: mirrorlist is prefered over baseurl
9191
Given I create directory "/baseurlrepo"
9292
And I execute "createrepo_c {context.dnf.installroot}/baseurlrepo"
9393
And I create directory "/mirrorlistrepo"
94-
And I copy file "{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-2.12.1-1.fc29.noarch.rpm" to "/mirrorlistrepo/setup-2.12.1-1.fc29.noarch.rpm"
94+
And I copy file "{context.dnf.fixturesdir}/repos/dnf-ci-fedora/noarch/setup-0:2.12.1-1.fc29.noarch.rpm" to "/mirrorlistrepo/setup-0:2.12.1-1.fc29.noarch.rpm"
9595
And I execute "createrepo_c {context.dnf.installroot}/mirrorlistrepo"
9696
And I create and substitute file "/tmp/mirrorlist" with
9797
"""

0 commit comments

Comments
 (0)