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
897 B
Diff
27 lines
897 B
Diff
From 9d303be7e9f856ab41bec24e6dd83a00a1a7a04e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Piotr=20Ka=C5=BAmierczak?= <me@piotrkazmierczak.com>
|
|
Date: Wed, 3 May 2017 18:38:15 +0200
|
|
Subject: [PATCH] fixing beacons.list integration test failure
|
|
|
|
---
|
|
tests/integration/modules/beacons.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/integration/modules/beacons.py b/tests/integration/modules/beacons.py
|
|
index e04aa92dd6..ee1e81b898 100644
|
|
--- a/tests/integration/modules/beacons.py
|
|
+++ b/tests/integration/modules/beacons.py
|
|
@@ -66,7 +66,7 @@ class BeaconsTest(integration.ModuleCase):
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
- if os.path.isfile(cls.beacons_config_file_path):
|
|
+ if cls.beacons_config_file_path and os.path.isfile(cls.beacons_config_file_path):
|
|
os.unlink(cls.beacons_config_file_path)
|
|
|
|
def setUp(self):
|
|
--
|
|
2.11.0
|
|
|
|
|