Skip to content

Commit 371e56e

Browse files
fhbashkontura
authored andcommitted
Fixes test to check epoch in package name
1 parent 65d81fb commit 371e56e

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

dnf-behave-tests/dnf/module/install-package-ursine.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Scenario: I can't reinstall installed non-modular content which is masked by act
3131
And I successfully execute dnf with args "module enable DnfCiModuleNoDefaults:stable"
3232
When I execute dnf with args "reinstall wget"
3333
Then the exit code is 1
34-
And stderr contains "Installed packages for argument 'wget' are not available in repositories in the same version, available versions: wget-1.18.5-5.module.x86_64, cannot reinstall."
34+
And stderr contains "Installed packages for argument 'wget' are not available in repositories in the same version, available versions: wget-0:1.18.5-5.module.x86_64, cannot reinstall."
3535

3636

3737
Scenario: I can remove installed non-modular content

dnf-behave-tests/dnf/transaction-output.feature

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Given I use repository "dnf-ci-thirdparty"
1111
And Transaction is following
1212
| Action | Package |
1313
| install | forTestingPurposesWeEvenHaveReallyLongVersions-0:1435347658326856238756823658aaaa-1.x86_64 |
14-
And stdout contains "forTestingPurposesWeEvenHaveReallyLongVersions\s+x86_64\s+1435347658326856238756823658aaaa-1\s+dnf-ci-thirdparty\s+.*"
14+
And stdout contains "forTestingPurposesWeEvenHaveReallyLongVersions\s+x86_64\s+0:1435347658326856238756823658aaaa-1\s+dnf-ci-thirdparty\s+.*"
1515

1616

1717
@bz1773436
@@ -57,21 +57,21 @@ Scenario: Packages in transaction are sorted by NEVRA
5757
"""
5858
And stdout matches line by line
5959
"""
60-
Package Arch Version Repository Size
60+
Package Arch Version Repository Size
6161
Installing:
62-
SuperRipper x86_64 1.0-1 dnf-ci-thirdparty \d\.\d B
63-
flac x86_64 1.3.2-8.fc29 dnf-ci-fedora \d\.\d B
64-
glibc x86_64 2.28-9.fc29 dnf-ci-fedora \d\.\d B
65-
wget x86_64 1.19.5-5.fc29 dnf-ci-fedora \d\.\d B
62+
SuperRipper x86_64 0:1.0-1 dnf-ci-thirdparty \d\.\d B
63+
flac x86_64 0:1.3.2-8.fc29 dnf-ci-fedora \d\.\d B
64+
glibc x86_64 0:2.28-9.fc29 dnf-ci-fedora \d\.\d B
65+
wget x86_64 0:1.19.5-5.fc29 dnf-ci-fedora \d\.\d B
6666
Installing dependencies:
67-
abcde noarch 2.9.2-1.fc29 dnf-ci-fedora \d\.\d B
68-
basesystem noarch 11-6.fc29 dnf-ci-fedora \d\.\d B
69-
filesystem x86_64 3.9-2.fc29 dnf-ci-fedora \d\.\d B
70-
glibc-all-langpacks x86_64 2.28-9.fc29 dnf-ci-fedora \d\.\d B
71-
glibc-common x86_64 2.28-9.fc29 dnf-ci-fedora \d\.\d B
72-
setup noarch 2.12.1-1.fc29 dnf-ci-fedora \d\.\d B
67+
abcde noarch 0:2.9.2-1.fc29 dnf-ci-fedora \d\.\d B
68+
basesystem noarch 0:11-6.fc29 dnf-ci-fedora \d\.\d B
69+
filesystem x86_64 0:3.9-2.fc29 dnf-ci-fedora \d\.\d B
70+
glibc-all-langpacks x86_64 0:2.28-9.fc29 dnf-ci-fedora \d\.\d B
71+
glibc-common x86_64 0:2.28-9.fc29 dnf-ci-fedora \d\.\d B
72+
setup noarch 0:2.12.1-1.fc29 dnf-ci-fedora \d\.\d B
7373
Installing weak dependencies:
74-
FlacBetterEncoder x86_64 1.0-1 dnf-ci-thirdparty \d\.\d B
74+
FlacBetterEncoder x86_64 0:1.0-1 dnf-ci-thirdparty \d\.\d B
7575
7676
Transaction Summary:
7777
Installing: 11 packages

dnf-behave-tests/dnf/transaction-sr/replay-errors.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
6767
"rpms": [
6868
{
6969
"action": "Install",
70-
"nevra": "bottom-a2-1.0-1.x86_64",
70+
"nevra": "bottom-a2-0:1.0-1.x86_64",
7171
"reason": "Dependency",
7272
"repo_id": "transaction-sr"
7373
}
@@ -81,7 +81,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
8181
"""
8282
<REPOSYNC>
8383
Failed to resolve the transaction:
84-
Package "bottom-a2-1.0-1.x86_64" is already installed.
84+
Package "bottom-a2-0:1.0-1.x86_64" is already installed.
8585
"""
8686

8787

dnf-behave-tests/dnf/transaction-sr/replay.feature

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
3030
When I execute dnf with args "replay ./transaction"
3131
Then the exit code is 0
3232
And Transaction is following
33-
| Action | Package |
34-
| install-dep | bottom-a1-2.0-1.noarch |
35-
| install | top-d-1.0-1.x86_64 |
33+
| Action | Package |
34+
| install-dep | bottom-a1-0:2.0-1.noarch |
35+
| install | top-d-0:1.0-1.x86_64 |
3636
And dnf5 transaction items for transaction "last" are
3737
| action | package | reason | repository |
3838
| Install | bottom-a1-0:2.0-1.noarch | Dependency | transaction-sr |
@@ -838,9 +838,9 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
838838
When I execute dnf with args "replay ./transaction"
839839
Then the exit code is 0
840840
And Transaction is following
841-
| Action | Package |
842-
| install | installonly-1.0-1.x86_64 |
843-
| install | installonly-2.0-1.x86_64 |
841+
| Action | Package |
842+
| install | installonly-0:1.0-1.x86_64 |
843+
| install | installonly-0:2.0-1.x86_64 |
844844
And dnf5 transaction items for transaction "last" are
845845
| action | package | reason | repository |
846846
| Install | installonly-0:1.0-1.x86_64 | User | transaction-sr |
@@ -1220,13 +1220,13 @@ Given I successfully execute dnf with args "install bottom-a1-1.0"
12201220
Then the exit code is 0
12211221
And stderr contains lines
12221222
"""
1223-
Cannot perform Install action because 'bottom-a1-2.0-1.noarch' is installed in a different version: 'bottom-a1-1.0-1.noarch'.
1223+
Cannot perform Install action because 'bottom-a1-2.0-1.noarch' is installed in a different version: 'bottom-a1-0:1.0-1.noarch'.
12241224
12251225
Warning: skipped OpenPGP checks for 2 packages from repository: transaction-sr
12261226
"""
12271227
And Transaction is following
12281228
| Action | Package |
1229-
| upgrade | bottom-a1-2.0-1.noarch |
1229+
| upgrade | bottom-a1-0:2.0-1.noarch |
12301230
| upgrade | top-a-1:2.0-1.x86_64 |
12311231
And dnf5 transaction items for transaction "last" are
12321232
| action | package | reason | repository |
@@ -1235,13 +1235,13 @@ Given I successfully execute dnf with args "install bottom-a1-1.0"
12351235
| Replaced | bottom-a1-0:1.0-1.noarch | User | @System |
12361236
| Replaced | top-a-1:1.0-1.x86_64 | User | @System |
12371237
And package reasons are
1238-
| Package | Reason |
1239-
| bottom-a1-2.0-1.noarch | User |
1240-
| bottom-a2-1.0-1.x86_64 | Dependency |
1241-
| bottom-a3-1.0-1.x86_64 | Dependency |
1242-
| mid-a1-1.0-1.x86_64 | Dependency |
1243-
| mid-a2-1.0-1.x86_64 | Weak Dependency |
1244-
| top-a-1:2.0-1.x86_64 | User |
1238+
| Package | Reason |
1239+
| bottom-a1-2.0-1.noarch | User |
1240+
| bottom-a2-1.0-1.x86_64 | Dependency |
1241+
| bottom-a3-1.0-1.x86_64 | Dependency |
1242+
| mid-a1-1.0-1.x86_64 | Dependency |
1243+
| mid-a2-1.0-1.x86_64 | Weak Dependency |
1244+
| top-a-1:2.0-1.x86_64 | User |
12451245

12461246

12471247
Scenario: ignore-installed: Replaying an already installed transaction results in noop
@@ -1288,10 +1288,10 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
12881288
And stderr is
12891289
"""
12901290
<REPOSYNC>
1291-
Package "bottom-a2-1.0-1.x86_64" is already installed.
1292-
Package "bottom-a3-1.0-1.x86_64" is already installed.
1293-
Package "mid-a1-1.0-1.x86_64" is already installed.
1294-
Package "mid-a2-1.0-1.x86_64" is already installed.
1291+
Package "bottom-a2-0:1.0-1.x86_64" is already installed.
1292+
Package "bottom-a3-0:1.0-1.x86_64" is already installed.
1293+
Package "mid-a1-0:1.0-1.x86_64" is already installed.
1294+
Package "mid-a2-0:1.0-1.x86_64" is already installed.
12951295
Package "top-a-1:1.0-1.x86_64" is already installed.
12961296
"""
12971297
And Transaction is empty
@@ -1310,7 +1310,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
13101310
},
13111311
{
13121312
"action": "Replaced",
1313-
"nevra": "bottom-a1-1.0-1.noarch",
1313+
"nevra": "bottom-a1-0:1.0-1.noarch",
13141314
"reason": "Dependency",
13151315
"repo_id": "@System"
13161316
},
@@ -1334,7 +1334,7 @@ Given I create file "/{context.dnf.tempdir}/transaction/transaction.json" with
13341334
Then the exit code is 0
13351335
And stderr contains lines
13361336
"""
1337-
Cannot perform Remove action for Package 'bottom-a1-1.0-1.noarch' because it is not installed.
1337+
Cannot perform Remove action for Package 'bottom-a1-0:1.0-1.noarch' because it is not installed.
13381338
13391339
Warning: skipped OpenPGP checks for 2 packages from repository: transaction-sr
13401340
"""

0 commit comments

Comments
 (0)