7966fde1ef
- Update to 2018.3.2 See https://docs.saltstack.com/en/latest/topics/releases/2018.3.2.html for full changelog - Added: * accounting-for-when-files-in-an-archive-contain-non-.patch * add-all_versions-parameter-to-include-all-installed-.patch * add-custom-suse-capabilities-as-grains.patch * add-engine-relaying-libvirt-events.patch * add-environment-variable-to-know-if-yum-is-invoked-f.patch * add-other-attribute-to-gecos-fields-to-avoid-inconsi.patch * align-suse-salt-master.service-limitnofiles-limit-wi.patch * avoid-incomprehensive-message-if-crashes.patch * fix-deprecation-warning-bsc-1095507.patch * fix-diffing-binary-files-in-file.get_diff-bsc-109839.patch * fix-unboundlocalerror-in-file.get_diff.patch * fix-zypper.list_pkgs-to-be-aligned-with-pkg-state.patch * prevent-zypper-from-parsing-repo-configuration-from-.patch * remove-old-hack-when-reporting-multiversion-packages.patch * show-recommendations-for-salt-ssh-cross-version-pyth.patch - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * add-saltssh-multi-version-support-across-python-inte.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * do-not-override-jid-on-returners-only-sending-back-t.patch * enable-passing-a-unix_socket-for-mysql-returners-bsc.patch * fall-back-to-pymysql.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * fix-decrease-loglevel-when-unable-to-resolve-addr.patch * fix-for-ec2-rate-limit-failures.patch OBS-URL: https://build.opensuse.org/request/show/626472 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=127
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From 11186ce52ae42967c49a6e238659a566e488a6b4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Mon, 23 Jul 2018 16:32:26 +0100
|
|
Subject: [PATCH] Remove old hack when reporting multiversion packages
|
|
|
|
Fix unit tests for zypper pkg.upgrade
|
|
---
|
|
salt/modules/zypper.py | 5 -----
|
|
tests/unit/modules/test_zypper.py | 8 +++++++-
|
|
2 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
|
|
index 4689f84926..695bce4f4e 100644
|
|
--- a/salt/modules/zypper.py
|
|
+++ b/salt/modules/zypper.py
|
|
@@ -1480,11 +1480,6 @@ def upgrade(refresh=True,
|
|
__zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update)
|
|
_clean_cache()
|
|
new = list_pkgs()
|
|
-
|
|
- # Handle packages which report multiple new versions
|
|
- # (affects only kernel packages at this point)
|
|
- for pkg in new:
|
|
- new[pkg] = new[pkg].split(',')[-1]
|
|
ret = salt.utils.data.compare_dicts(old, new)
|
|
|
|
if __zypper__.exit_code not in __zypper__.SUCCESS_EXIT_CODES:
|
|
diff --git a/tests/unit/modules/test_zypper.py b/tests/unit/modules/test_zypper.py
|
|
index bb15aca11a..424438c8bf 100644
|
|
--- a/tests/unit/modules/test_zypper.py
|
|
+++ b/tests/unit/modules/test_zypper.py
|
|
@@ -429,7 +429,13 @@ class ZypperTestCase(TestCase, LoaderModuleMockMixin):
|
|
zypper_mock.assert_any_call('update', '--auto-agree-with-licenses')
|
|
|
|
with patch('salt.modules.zypper.list_pkgs',
|
|
- MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.1,1.2"}])):
|
|
+ MagicMock(side_effect=[{"kernel-default": "1.1"}, {"kernel-default": "1.1,1.2"}])):
|
|
+ ret = zypper.upgrade()
|
|
+ self.assertDictEqual(ret, {"kernel-default": {"old": "1.1", "new": "1.1,1.2"}})
|
|
+ zypper_mock.assert_any_call('update', '--auto-agree-with-licenses')
|
|
+
|
|
+ with patch('salt.modules.zypper.list_pkgs',
|
|
+ MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.2"}])):
|
|
ret = zypper.upgrade()
|
|
self.assertDictEqual(ret, {"vim": {"old": "1.1", "new": "1.2"}})
|
|
zypper_mock.assert_any_call('update', '--auto-agree-with-licenses')
|
|
--
|
|
2.17.1
|
|
|
|
|