ae1540a455
- Bugfix: clean up `change` attribute from interface dict (upstream) Issue: https://github.com/saltstack/salt/issues/41461 PR: 1. https://github.com/saltstack/salt/pull/41487 2. https://github.com/saltstack/salt/pull/41533 Added: * clean-up-change-attribute-from-interface-dict.patch - Bugfix: orchestrate and batches returns false failed information https://github.com/saltstack/salt/issues/40635 - speed-up cherrypy by removing sleep call - wrong os_family grains on SUSE - fix unittests (bsc#1038855) - fix setting the language on SUSE systems (bsc#1038855) - Bugfix: unable to use hostname for minion ID as '127' (upstream) - Bugfix: remove sleep call in CheppryPy API handler (upstream) - Fix core grains constants for timezone (bsc#1032931) - Added: * bugfix-unable-to-use-127-as-hostname.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-setting-language-on-suse-systems.patch * fixed-issue-with-parsing-of-master-minion-returns-wh.patch * rest_cherrypy-remove-sleep-call.patch * use-correct-grain-constants-for-timezone.patch - Update to 2016.11.4 See https://docs.saltstack.com/en/develop/topics/releases/2016.11.4.html for full changelog - Changed: * add-options-for-dockerng.patch * fix-regression-in-file.get_managed-add-unit-tests.patch OBS-URL: https://build.opensuse.org/request/show/514025 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=89
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
From 1d5e0e1c9d2ca8bb01cfe781289b4b03e0ce4c1e Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Fri, 19 May 2017 14:07:08 +0200
|
|
Subject: [PATCH] Fix os_family case in unittest
|
|
|
|
---
|
|
tests/unit/modules/inspect_collector_test.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
|
|
index 9105670526..293de1ad51 100644
|
|
--- a/tests/unit/modules/inspect_collector_test.py
|
|
+++ b/tests/unit/modules/inspect_collector_test.py
|
|
@@ -127,7 +127,7 @@ gcc-6-base:i386
|
|
inspector.grains_core.os_data = MagicMock()
|
|
inspector.grains_core.os_data().get = MagicMock(return_value='Debian')
|
|
self.assertEqual(inspector._get_cfg_pkgs(), 'dpkg')
|
|
- inspector.grains_core.os_data().get = MagicMock(return_value='SUSE')
|
|
+ inspector.grains_core.os_data().get = MagicMock(return_value='Suse')
|
|
self.assertEqual(inspector._get_cfg_pkgs(), 'rpm')
|
|
inspector.grains_core.os_data().get = MagicMock(return_value='redhat')
|
|
self.assertEqual(inspector._get_cfg_pkgs(), 'rpm')
|
|
--
|
|
2.13.0
|
|
|
|
|