gpgcheck: fix unit tests after adding warning and SKIPPED

rpm-software-management · Jul 24, 2023 · a1a0331 · a1a0331
1 parent 0b8eba0
commit a1a0331
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/test/libdnf5/base/test_transaction.cpp b/test/libdnf5/base/test_transaction.cpp
@@ -36,7 +36,9 @@ void BaseTransactionTest::test_check_gpg_signatures_no_gpgcheck() {
 
     CPPUNIT_ASSERT_EQUAL((size_t)1, transaction.get_transaction_packages_count());
     CPPUNIT_ASSERT(transaction.check_gpg_signatures());
-    CPPUNIT_ASSERT(transaction.get_gpg_signature_problems().empty());
+    CPPUNIT_ASSERT_EQUAL((size_t)1, transaction.get_gpg_signature_problems().size());
+    CPPUNIT_ASSERT_EQUAL(
+        std::string("Warning: skipped PGP checks for 1 package(s)."), transaction.get_gpg_signature_problems()[0]);
 }
 
 void BaseTransactionTest::test_check_gpg_signatures_fail() {

diff --git a/test/python3/libdnf5/base/test_transaction.py b/test/python3/libdnf5/base/test_transaction.py
@@ -32,7 +32,8 @@ def test_check_gpg_signatures_no_gpgcheck(self):
 
         self.assertEqual(1, transaction.get_transaction_packages_count())
         self.assertTrue(transaction.check_gpg_signatures())
-        self.assertEqual((), transaction.get_gpg_signature_problems())
+        self.assertEqual(('Warning: skipped PGP checks for 1 package(s).',),
+                         transaction.get_gpg_signature_problems())
 
     def test_check_gpg_signatures_fail(self):
         self.base.get_config().gpgcheck = True

diff --git a/test/python3/libdnf5/rpm/test_rpm_signature.py b/test/python3/libdnf5/rpm/test_rpm_signature.py
@@ -35,7 +35,7 @@ def test_checking_signature(self):
 
         rpm_sign = libdnf5.rpm.RpmSignature(self.base)
         result = rpm_sign.check_package_signature(package)
-        self.assertEqual(result, libdnf5.rpm.RpmSignature.CheckResult_OK)
+        self.assertEqual(result, libdnf5.rpm.RpmSignature.CheckResult_SKIPPED)
 
     def test_key_files_vector_wrapper(self):
         # Test wrapper for std::vector<KeyInfo>