terminalmage pushed to salt (epel7). "Update to bugfix release 2015.5.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 27 17:10:42 UTC 2015
From c5b1387f4e4b12fc42a51a57ecf4d582ce0c956a Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik at saltstack.com>
Date: Wed, 27 May 2015 11:20:07 -0500
Subject: Update to bugfix release 2015.5.1
diff --git a/.gitignore b/.gitignore
index c3de2cf..9a0e11c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
/salt-2014.7.5.tar.gz
/salt-2015.5.0.tar.gz
/SaltTesting-2015.5.8.tar.gz
+/salt-2015.5.1.tar.gz
diff --git a/salt-2015.5.0-tests.patch b/salt-2015.5.0-tests.patch
deleted file mode 100644
index 8de2170..0000000
--- a/salt-2015.5.0-tests.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git a/tests/unit/modules/artifactory_test.py b/tests/unit/modules/artifactory_test.py
-index 33774e3..11faa22 100644
---- a/tests/unit/modules/artifactory_test.py
-+++ b/tests/unit/modules/artifactory_test.py
-@@ -1,9 +1,10 @@
- # -*- coding: utf-8 -*-
- from salt.modules import artifactory
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.mock import MagicMock
-
-
-+ at skipIf(True, 'Not failing in Jenkins')
- class ArtifactoryTestCase(TestCase):
-
- org_module_functions = {}
-diff --git a/tests/unit/modules/gpg_test.py b/tests/unit/modules/gpg_test.py
-index a787853..158387c 100644
---- a/tests/unit/modules/gpg_test.py
-+++ b/tests/unit/modules/gpg_test.py
-@@ -16,7 +16,11 @@ from salttesting.mock import (
- )
-
- from salttesting.helpers import ensure_in_syspath
--from mock import mock_open
-+try:
-+ from mock import mock_open
-+ HAS_MOCK_OPEN = True
-+except ImportError:
-+ HAS_MOCK_OPEN = False
-
- ensure_in_syspath('../../')
-
-@@ -315,6 +319,7 @@ class GpgTestCase(TestCase):
-
- # 'import_key' function tests: 1
-
-+ @skipIf(not HAS_MOCK_OPEN, 'Missing mock_open')
- def test_import_key(self):
- '''
- Tests if it import a key from text or file.
-diff --git a/tests/unit/modules/groupadd_test.py b/tests/unit/modules/groupadd_test.py
-index 7b7254e..b616388 100644
---- a/tests/unit/modules/groupadd_test.py
-+++ b/tests/unit/modules/groupadd_test.py
-@@ -4,7 +4,7 @@
- '''
-
- # Import Salt Testing Libs
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.mock import MagicMock, patch
- #-------- from salt.exceptions import SaltInvocationError, CommandExecutionError
-
-@@ -15,6 +15,7 @@ from salt.modules import groupadd
- import grp
-
-
-+ at skipIf(True, 'Not failing in Jenkins')
- class GroupAddTestCase(TestCase):
- '''
- TestCase for salt.modules.groupadd
-diff --git a/tests/unit/modules/jboss7_test.py b/tests/unit/modules/jboss7_test.py
-index ec83a8b..9a333cc 100644
---- a/tests/unit/modules/jboss7_test.py
-+++ b/tests/unit/modules/jboss7_test.py
-@@ -4,7 +4,7 @@ from salt.utils.odict import OrderedDict
-
- from salt.modules import jboss7
-
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.mock import MagicMock
-
- try:
-@@ -15,6 +15,7 @@ except NameError:
- __builtin__.__salt__ = {}
-
-
-+ at skipIf(True, 'Not failing in Jenkins')
- class JBoss7TestCase(TestCase):
- jboss_config = {}
- org_run_operation = None
-diff --git a/tests/unit/modules/rh_ip_test.py b/tests/unit/modules/rh_ip_test.py
-index 7e32fdf..6f953be 100644
---- a/tests/unit/modules/rh_ip_test.py
-+++ b/tests/unit/modules/rh_ip_test.py
-@@ -32,6 +32,7 @@ class RhipTestCase(TestCase):
- '''
- Test cases for salt.modules.rh_ip
- '''
-+ @skipIf(True, 'Not failing in Jenkins')
- def test_build_bond(self):
- '''
- Test to create a bond script in /etc/modprobe.d with the passed
-diff --git a/tests/unit/modules/win_network_test.py b/tests/unit/modules/win_network_test.py
-index effafd6..ee3e000 100644
---- a/tests/unit/modules/win_network_test.py
-+++ b/tests/unit/modules/win_network_test.py
-@@ -172,7 +172,7 @@ class WinNetworkTestCase(TestCase):
- ['Ethernet'])
-
- # 'interfaces' function tests: 1
--
-+ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
- def test_interfaces(self):
- '''
- Test if it return information about all the interfaces on the minion
-@@ -213,6 +213,7 @@ class WinNetworkTestCase(TestCase):
-
- # 'ip_addrs' function tests: 1
-
-+ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
- def test_ip_addrs(self):
- '''
- Test if it returns a list of IPv4 addresses assigned to the host.
-@@ -221,6 +222,7 @@ class WinNetworkTestCase(TestCase):
-
- # 'ip_addrs6' function tests: 1
-
-+ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
- def test_ip_addrs6(self):
- '''
- Test if it returns a list of IPv6 addresses assigned to the host.
-diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
-index a1dbda6..9b1beed 100644
---- a/tests/unit/pydsl_test.py
-+++ b/tests/unit/pydsl_test.py
-@@ -10,7 +10,7 @@ import copy
- from cStringIO import StringIO
-
- # Import Salt Testing libs
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.helpers import ensure_in_syspath
-
- ensure_in_syspath('../')
-@@ -299,6 +299,7 @@ class PyDSLRendererTestCase(TestCase):
- finally:
- shutil.rmtree(dirpath, ignore_errors=True)
-
-+ @skipIf(True, 'Not failing in Jenkins')
- def test_rendering_includes(self):
- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
- if not os.path.isdir(dirpath):
-diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
-index 588ec1a..acd53fa 100644
---- a/tests/unit/states/archive_test.py
-+++ b/tests/unit/states/archive_test.py
-@@ -78,9 +78,7 @@ class ArchiveTest(TestCase):
- running_as = 'root'
- filename = os.path.join(
- tmp_dir,
-- 'files/test/_tmp{0}_test_archive_.tar'.format(
-- '' if running_as == 'root' else '_{0}'.format(running_as)
-- )
-+ 'files/test/_tmp_test_archive_.tar'
- )
- for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
- ret = archive.extracted(tmp_dir,
-diff --git a/tests/unit/states/jboss7_test.py b/tests/unit/states/jboss7_test.py
-index c1cda69..ae205f8 100644
---- a/tests/unit/states/jboss7_test.py
-+++ b/tests/unit/states/jboss7_test.py
-@@ -1,5 +1,5 @@
- # -*- coding: utf-8 -*-
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.mock import MagicMock
- from salt.states import jboss7
- from salt.exceptions import CommandExecutionError
-@@ -13,6 +13,7 @@ except NameError:
- __builtin__.__salt__ = {}
-
-
-+ at skipIf(True, 'Not failing in Jenkins')
- class JBoss7StateTestCase(TestCase):
-
- org_module_functions = {}
diff --git a/salt-2015.5.1-tests.patch b/salt-2015.5.1-tests.patch
new file mode 100644
index 0000000..8de2170
--- /dev/null
+++ b/salt-2015.5.1-tests.patch
@@ -0,0 +1,179 @@
+diff --git a/tests/unit/modules/artifactory_test.py b/tests/unit/modules/artifactory_test.py
+index 33774e3..11faa22 100644
+--- a/tests/unit/modules/artifactory_test.py
++++ b/tests/unit/modules/artifactory_test.py
+@@ -1,9 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from salt.modules import artifactory
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.mock import MagicMock
+
+
++ at skipIf(True, 'Not failing in Jenkins')
+ class ArtifactoryTestCase(TestCase):
+
+ org_module_functions = {}
+diff --git a/tests/unit/modules/gpg_test.py b/tests/unit/modules/gpg_test.py
+index a787853..158387c 100644
+--- a/tests/unit/modules/gpg_test.py
++++ b/tests/unit/modules/gpg_test.py
+@@ -16,7 +16,11 @@ from salttesting.mock import (
+ )
+
+ from salttesting.helpers import ensure_in_syspath
+-from mock import mock_open
++try:
++ from mock import mock_open
++ HAS_MOCK_OPEN = True
++except ImportError:
++ HAS_MOCK_OPEN = False
+
+ ensure_in_syspath('../../')
+
+@@ -315,6 +319,7 @@ class GpgTestCase(TestCase):
+
+ # 'import_key' function tests: 1
+
++ @skipIf(not HAS_MOCK_OPEN, 'Missing mock_open')
+ def test_import_key(self):
+ '''
+ Tests if it import a key from text or file.
+diff --git a/tests/unit/modules/groupadd_test.py b/tests/unit/modules/groupadd_test.py
+index 7b7254e..b616388 100644
+--- a/tests/unit/modules/groupadd_test.py
++++ b/tests/unit/modules/groupadd_test.py
+@@ -4,7 +4,7 @@
+ '''
+
+ # Import Salt Testing Libs
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.mock import MagicMock, patch
+ #-------- from salt.exceptions import SaltInvocationError, CommandExecutionError
+
+@@ -15,6 +15,7 @@ from salt.modules import groupadd
+ import grp
+
+
++ at skipIf(True, 'Not failing in Jenkins')
+ class GroupAddTestCase(TestCase):
+ '''
+ TestCase for salt.modules.groupadd
+diff --git a/tests/unit/modules/jboss7_test.py b/tests/unit/modules/jboss7_test.py
+index ec83a8b..9a333cc 100644
+--- a/tests/unit/modules/jboss7_test.py
++++ b/tests/unit/modules/jboss7_test.py
+@@ -4,7 +4,7 @@ from salt.utils.odict import OrderedDict
+
+ from salt.modules import jboss7
+
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.mock import MagicMock
+
+ try:
+@@ -15,6 +15,7 @@ except NameError:
+ __builtin__.__salt__ = {}
+
+
++ at skipIf(True, 'Not failing in Jenkins')
+ class JBoss7TestCase(TestCase):
+ jboss_config = {}
+ org_run_operation = None
+diff --git a/tests/unit/modules/rh_ip_test.py b/tests/unit/modules/rh_ip_test.py
+index 7e32fdf..6f953be 100644
+--- a/tests/unit/modules/rh_ip_test.py
++++ b/tests/unit/modules/rh_ip_test.py
+@@ -32,6 +32,7 @@ class RhipTestCase(TestCase):
+ '''
+ Test cases for salt.modules.rh_ip
+ '''
++ @skipIf(True, 'Not failing in Jenkins')
+ def test_build_bond(self):
+ '''
+ Test to create a bond script in /etc/modprobe.d with the passed
+diff --git a/tests/unit/modules/win_network_test.py b/tests/unit/modules/win_network_test.py
+index effafd6..ee3e000 100644
+--- a/tests/unit/modules/win_network_test.py
++++ b/tests/unit/modules/win_network_test.py
+@@ -172,7 +172,7 @@ class WinNetworkTestCase(TestCase):
+ ['Ethernet'])
+
+ # 'interfaces' function tests: 1
+-
++ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
+ def test_interfaces(self):
+ '''
+ Test if it return information about all the interfaces on the minion
+@@ -213,6 +213,7 @@ class WinNetworkTestCase(TestCase):
+
+ # 'ip_addrs' function tests: 1
+
++ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
+ def test_ip_addrs(self):
+ '''
+ Test if it returns a list of IPv4 addresses assigned to the host.
+@@ -221,6 +222,7 @@ class WinNetworkTestCase(TestCase):
+
+ # 'ip_addrs6' function tests: 1
+
++ @skipIf(not salt.utils.is_windows(), 'Not being run on Windows')
+ def test_ip_addrs6(self):
+ '''
+ Test if it returns a list of IPv6 addresses assigned to the host.
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index a1dbda6..9b1beed 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -10,7 +10,7 @@ import copy
+ from cStringIO import StringIO
+
+ # Import Salt Testing libs
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.helpers import ensure_in_syspath
+
+ ensure_in_syspath('../')
+@@ -299,6 +299,7 @@ class PyDSLRendererTestCase(TestCase):
+ finally:
+ shutil.rmtree(dirpath, ignore_errors=True)
+
++ @skipIf(True, 'Not failing in Jenkins')
+ def test_rendering_includes(self):
+ dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+ if not os.path.isdir(dirpath):
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index 588ec1a..acd53fa 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -78,9 +78,7 @@ class ArchiveTest(TestCase):
+ running_as = 'root'
+ filename = os.path.join(
+ tmp_dir,
+- 'files/test/_tmp{0}_test_archive_.tar'.format(
+- '' if running_as == 'root' else '_{0}'.format(running_as)
+- )
++ 'files/test/_tmp_test_archive_.tar'
+ )
+ for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
+ ret = archive.extracted(tmp_dir,
+diff --git a/tests/unit/states/jboss7_test.py b/tests/unit/states/jboss7_test.py
+index c1cda69..ae205f8 100644
+--- a/tests/unit/states/jboss7_test.py
++++ b/tests/unit/states/jboss7_test.py
+@@ -1,5 +1,5 @@
+ # -*- coding: utf-8 -*-
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.mock import MagicMock
+ from salt.states import jboss7
+ from salt.exceptions import CommandExecutionError
+@@ -13,6 +13,7 @@ except NameError:
+ __builtin__.__salt__ = {}
+
+
++ at skipIf(True, 'Not failing in Jenkins')
+ class JBoss7StateTestCase(TestCase):
+
+ org_module_functions = {}
diff --git a/salt.spec b/salt.spec
index 2f1c5b7..c9b6e51 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,7 +15,7 @@
%define _salttesting_ver 2015.5.8
Name: salt
-Version: 2015.5.0
+Version: 2015.5.1
Release: 1%{?dist}
Summary: A parallel remote execution system
@@ -447,6 +447,9 @@ rm -rf %{buildroot}
%endif
%changelog
+* Wed May 27 2015 Erik Johnson <erik at saltstack.com> - 2015.5.1-1
+- Update to bugfix release 2015.5.1
+
* Mon May 11 2015 Erik Johnson <erik at saltstack.com> - 2015.5.0-1
- Update to feature release 2015.5.0
diff --git a/sources b/sources
index a42e4c8..40a0fa3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-83c2198f897eb68b41da8c6ec1d3c5d4 salt-2015.5.0.tar.gz
+7eb3e500dbe5b556e41861845da27ddf salt-2015.5.1.tar.gz
b3ef5ee72681cc650b6b56ed93f4f4e6 SaltTesting-2015.5.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/salt.git/commit/?h=epel7&id=c5b1387f4e4b12fc42a51a57ecf4d582ce0c956a
More information about the scm-commits
mailing list