File do-not-break-repo-files-with-multiple-line-valu... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File do-not-break-repo-files-with-multiple-line-values-on.patch of Package salt (Revision 19ba0012dc6d7a2873a7ca61a4bca72b)

Currently displaying revision 19ba0012dc6d7a2873a7ca61a4bca72b , Show latest

From e986ed8fc0d5da74374d9ded82e10c16fc984ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Wed, 29 May 2019 11:03:16 +0100
Subject: [PATCH] Do not break repo files with multiple line values on
 yumpkg (bsc#1135360)

---
 tests/integration/modules/test_pkg.py | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/integration/modules/test_pkg.py b/tests/integration/modules/test_pkg.py
index 7a720523da..e32013800d 100644
--- a/tests/integration/modules/test_pkg.py
+++ b/tests/integration/modules/test_pkg.py
@@ -194,6 +194,57 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
             if repo is not None:
                 self.run_function("pkg.del_repo", [repo])
 
+    def test_mod_del_repo_multiline_values(self):
+        """
+        test modifying and deleting a software repository defined with multiline values
+        """
+        os_grain = self.run_function("grains.item", ["os"])["os"]
+        repo = None
+        try:
+            if os_grain in ["CentOS", "RedHat", "SUSE"]:
+                my_baseurl = (
+                    "http://my.fake.repo/foo/bar/\n http://my.fake.repo.alt/foo/bar/"
+                )
+                expected_get_repo_baseurl = (
+                    "http://my.fake.repo/foo/bar/\nhttp://my.fake.repo.alt/foo/bar/"
+                )
+                major_release = int(
+                    self.run_function("grains.item", ["osmajorrelease"])[
+                        "osmajorrelease"
+                    ]
+                )
+                repo = "fakerepo"
+                name = "Fake repo for RHEL/CentOS/SUSE"
+                baseurl = my_baseurl
+                gpgkey = "https://my.fake.repo/foo/bar/MY-GPG-KEY.pub"
+                failovermethod = "priority"
+                gpgcheck = 1
+                enabled = 1
+                ret = self.run_function(
+                    "pkg.mod_repo",
+                    [repo],
+                    name=name,
+                    baseurl=baseurl,
+                    gpgkey=gpgkey,
+                    gpgcheck=gpgcheck,
+                    enabled=enabled,
+                    failovermethod=failovermethod,
+                )
+                # return data from pkg.mod_repo contains the file modified at
+                # the top level, so use next(iter(ret)) to get that key
+                self.assertNotEqual(ret, {})
+                repo_info = ret[next(iter(ret))]
+                self.assertIn(repo, repo_info)
+                self.assertEqual(repo_info[repo]["baseurl"], my_baseurl)
+                ret = self.run_function("pkg.get_repo", [repo])
+                self.assertEqual(ret["baseurl"], expected_get_repo_baseurl)
+                self.run_function("pkg.mod_repo", [repo])
+                ret = self.run_function("pkg.get_repo", [repo])
+                self.assertEqual(ret["baseurl"], expected_get_repo_baseurl)
+        finally:
+            if repo is not None:
+                self.run_function("pkg.del_repo", [repo])
+
     @requires_salt_modules("pkg.owner")
     def test_owner(self):
         """
-- 
2.29.2

Places

File do-not-break-repo-files-with-multiple-line-values-on.patch of Package salt (Revision 19ba0012dc6d7a2873a7ca61a4bca72b)

Places