Use "OpenPGP" instead of "PGP" in distro-sync, gpg

rpm-software-management · Dec 11, 2024 · 67601ca · 67601ca
1 parent 37b961c
commit 67601ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dnf-behave-tests/dnf/distro-sync.feature b/dnf-behave-tests/dnf/distro-sync.feature
@@ -67,8 +67,8 @@ Given I use repository "dnf-ci-gpg"
  Then the exit code is 1
   And stderr contains lines matching
     """
-    Transaction failed: Signature verification failed.
-    PGP check for package "wget-2\.0\.0-1\.fc29\.x86_64" \(.*/wget-2.0.0-1.fc29.x86_64.rpm\) from repo "dnf-ci-gpg-updates" has failed: Problem occurred when opening the package.
+    ^Transaction failed: Signature verification failed.$
+    ^OpenPGP check for package "wget-2\.0\.0-1\.fc29\.x86_64" \(.*/wget-2.0.0-1.fc29.x86_64.rpm\) from repo "dnf-ci-gpg-updates" has failed: Problem occurred when opening the package\.$
     """
 
 
@@ -86,8 +86,8 @@ Given I use repository "dnf-ci-gpg"
  Then the exit code is 1
   And stderr contains lines matching
     """
-    Transaction failed: Signature verification failed.
-    PGP check for package "wget-2\.0\.0-1\.fc29\.x86_64" \(.*/wget-2.0.0-1.fc29.x86_64.rpm\) from repo "dnf-ci-gpg-updates" has failed: Problem occurred when opening the package.
+    ^Transaction failed: Signature verification failed.$
+    ^OpenPGP check for package "wget-2\.0\.0-1\.fc29\.x86_64" \(.*/wget-2.0.0-1.fc29.x86_64.rpm\) from repo "dnf-ci-gpg-updates" has failed: Problem occurred when opening the package\.$
     """
 
 

diff --git a/dnf-behave-tests/dnf/gpg.feature b/dnf-behave-tests/dnf/gpg.feature
@@ -83,8 +83,8 @@ Scenario Outline: Fail to <offline> install signed package with incorrectly sign
     And RPMDB Transaction is empty
     And stderr contains lines matching
     """
-    Transaction failed: Signature verification failed
-    PGP check for package "basesystem-11-6\.fc29\.noarch" \(.*/basesystem-11-6\.fc29\.noarch\.rpm\) from repo "dnf-ci-gpg" has failed: Public key is not installed\.
+    ^Transaction failed: Signature verification failed\.$
+    ^OpenPGP check for package "basesystem-11-6\.fc29\.noarch" \(.*/basesystem-11-6\.fc29\.noarch\.rpm\) from repo "dnf-ci-gpg" has failed: Public key is not installed\.$
     """
 
 Examples:
@@ -103,8 +103,8 @@ Scenario Outline: Fail to <offline> install signed package with incorrect checks
     And RPMDB Transaction is empty
     And stderr contains lines matching
     """
-    Transaction failed: Signature verification failed
-    PGP check for package "broken-package-0\.2\.4-1\.fc29\.noarch" \(.*/broken-package-0\.2\.4-1\.fc29\.noarch\.rpm\) from repo "dnf-ci-gpg" has failed: Problem occurred when opening the package\.
+    ^Transaction failed: Signature verification failed\.$
+    ^OpenPGP check for package "broken-package-0\.2\.4-1\.fc29\.noarch" \(.*/broken-package-0\.2\.4-1\.fc29\.noarch\.rpm\) from repo "dnf-ci-gpg" has failed: Problem occurred when opening the package\.$
     """
 
 Examples:
@@ -141,8 +141,8 @@ Scenario Outline: Attempt to <offline> install unsigned package from repo with g
    Then the exit code is 1
     And stderr contains lines matching
     """
-    Transaction failed: Signature verification failed
-    PGP check for package "flac-1\.3\.2-8\.fc29\.x86_64" \(.*/flac-1\.3\.2-8\.fc29\.x86_64\.rpm\) from repo "dnf-ci-gpg" has failed: The package is not signed\.
+    ^Transaction failed: Signature verification failed\.$
+    ^OpenPGP check for package "flac-1\.3\.2-8\.fc29\.x86_64" \(.*/flac-1\.3\.2-8\.fc29\.x86_64\.rpm\) from repo "dnf-ci-gpg" has failed: The package is not signed\.$
     """
 
 Examples: