File reintroducing-reverted-changes.patch of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File reintroducing-reverted-changes.patch of Package salt (Revision ca2349ff73b74e0b323b6023771a4223)

Currently displaying revision ca2349ff73b74e0b323b6023771a4223 , Show latest

From da91692b5a6cc0b895fa2a1a3a6d0c21d9913ebf Mon Sep 17 00:00:00 2001
From: Jochen Breuer <jbreuer@suse.de>
Date: Wed, 25 Mar 2020 15:18:51 +0100
Subject: [PATCH] Reintroducing reverted changes

Reintroducing changes from commit e20362f6f053eaa4144583604e6aac3d62838419
that got partially reverted by this commit:
https://github.com/openSUSE/salt/commit/d0ef24d113bdaaa29f180031b5da384cffe08c64#diff-820e6ce667fe3afddbc1b9cf1682fdef
---
 tests/unit/modules/test_aptpkg.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/modules/test_aptpkg.py b/tests/unit/modules/test_aptpkg.py
index 2224aba9a1..ba1d874e69 100644
--- a/tests/unit/modules/test_aptpkg.py
+++ b/tests/unit/modules/test_aptpkg.py
@@ -253,7 +253,9 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin):
             if installed['wget'].get(names[name], False):
                 installed['wget'][name] = installed['wget'].pop(names[name])
 
-        assert aptpkg.info_installed('wget') == installed
+        del installed['wget']['status']
+        self.assertEqual(aptpkg.info_installed('wget'), installed)
+        self.assertEqual(len(aptpkg.info_installed()), 1)
 
     @patch('salt.modules.aptpkg.__salt__', {'lowpkg.info': MagicMock(return_value=LOWPKG_INFO)})
     def test_info_installed_attr(self):
-- 
2.16.4

Places

File reintroducing-reverted-changes.patch of Package salt (Revision ca2349ff73b74e0b323b6023771a4223)

Places