65598582f5
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=179
107 lines
4.4 KiB
Diff
107 lines
4.4 KiB
Diff
From f3ac041e34952a4b753e4afc9dc4b6adaa1d0ff2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Thu, 12 Mar 2020 13:26:51 +0000
|
|
Subject: [PATCH] Fix wrong test_mod_del_repo_multiline_values test
|
|
after rebase
|
|
|
|
---
|
|
tests/integration/modules/test_pkg.py | 63 ++++-----------------------
|
|
1 file changed, 8 insertions(+), 55 deletions(-)
|
|
|
|
diff --git a/tests/integration/modules/test_pkg.py b/tests/integration/modules/test_pkg.py
|
|
index 3ece73074b..933755a9ec 100644
|
|
--- a/tests/integration/modules/test_pkg.py
|
|
+++ b/tests/integration/modules/test_pkg.py
|
|
@@ -143,6 +143,10 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
|
|
self.run_function("pkg.del_repo", [repo])
|
|
|
|
@slowTest
|
|
+ @destructiveTest
|
|
+ @requires_salt_modules("pkg.mod_repo", "pkg.del_repo", "pkg.get_repo")
|
|
+ @requires_network()
|
|
+ @requires_system_grains
|
|
def test_mod_del_repo_multiline_values(self):
|
|
"""
|
|
test modifying and deleting a software repository defined with multiline values
|
|
@@ -150,10 +154,13 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
|
|
os_grain = self.run_function("grains.item", ["os"])["os"]
|
|
repo = None
|
|
try:
|
|
- if os_grain in ["CentOS", "RedHat"]:
|
|
+ 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_zypp = (
|
|
+ "http://my.fake.repo/foo/bar/%0A%20http://my.fake.repo.alt/foo/bar/"
|
|
+ )
|
|
expected_get_repo_baseurl = (
|
|
"http://my.fake.repo/foo/bar/\nhttp://my.fake.repo.alt/foo/bar/"
|
|
)
|
|
@@ -207,60 +214,6 @@ 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_zypp = (
|
|
- "http://my.fake.repo/foo/bar/%0A%20http://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
|
|
|
|
|