File fix-grains.test_core-unit-test-277.patch of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-grains.test_core-unit-test-277.patch of Package salt (Revision 26431b9bc6270e62432245d67830f307)

Currently displaying revision 26431b9bc6270e62432245d67830f307 , Show latest

From e2ff2f339ce7938ecdadf867f285a559bc2431dd Mon Sep 17 00:00:00 2001
From: Dominik Gedon <dgedon@suse.de>
Date: Tue, 6 Oct 2020 14:00:55 +0200
Subject: [PATCH] Fix grains.test_core unit test (#277)

This reverts 63b94ae and fixes the grains test_core unit test. The
changes are aligned with upstream.
---
 tests/unit/grains/test_core.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
index 918a9155cb..15de4e363e 100644
--- a/tests/unit/grains/test_core.py
+++ b/tests/unit/grains/test_core.py
@@ -60,11 +60,10 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
         with salt.utils.files.fopen(
             os.path.join(OS_RELEASE_DIR, "ubuntu-17.10")
         ) as os_release_file:
-            os_release_content = os_release_file.readlines()
-        with patch("salt.utils.files.fopen", mock_open()) as os_release_file:
-            os_release_file.return_value.__iter__.return_value = os_release_content
+            os_release_content = os_release_file.read()
+        with patch("salt.utils.files.fopen", mock_open(read_data=os_release_content)):
             os_release = core._parse_os_release(
-                ["/etc/os-release", "/usr/lib/os-release"]
+                "/etc/os-release", "/usr/lib/os-release"
             )
         self.assertEqual(
             os_release,
@@ -174,7 +173,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
     def test_missing_os_release(self):
         with patch("salt.utils.files.fopen", mock_open(read_data={})):
             os_release = core._parse_os_release(
-                ["/etc/os-release", "/usr/lib/os-release"]
+                "/etc/os-release", "/usr/lib/os-release"
             )
         self.assertEqual(os_release, {})
 
-- 
2.29.2

Places

File fix-grains.test_core-unit-test-277.patch of Package salt (Revision 26431b9bc6270e62432245d67830f307)

Places