app-admin/salt: Version bump to 2016.3.4

Package-Manager: portage-2.3.2

2 files changed, 65 insertions, 0 deletions

diff --git a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
new file mode 100644
index 000000000000..c27227571ad2
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
+index 9d2fa3ada7..710bbd75a5 100644
+--- a/tests/unit/modules/inspect_collector_test.py
++++ b/tests/unit/modules/inspect_collector_test.py
+@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase):
+         self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db')
+         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
+ 
+-    def test_file_tree(self):
+-        '''
+-        Test file tree.
+-
+-        :return:
+-        '''
+-
+-        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
+-        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+-        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
+-                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
+-                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
+-                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
+-        tree_result = []
+-        for chunk in inspector._get_all_files(tree_root):
+-            buff = []
+-            for pth in chunk:
+-                buff.append(pth.replace(tree_root, ''))
+-            tree_result.append(buff)
+-        tree_result = tuple(tree_result)
+-        self.assertEqual(expected_tree, tree_result)
+-
+     def test_get_unmanaged_files(self):
+         '''
+         Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
new file mode 100644
index 000000000000..dd542d630adf
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
@@ -0,0 +1,32 @@
+diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py
+index cce0023423..c1324f4a61 100644
+--- a/tests/unit/conf_test.py
++++ b/tests/unit/conf_test.py
+@@ -140,6 +140,8 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'):
++            return
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
+         for conf_file in cloud_sample_files:
+             profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file
+@@ -158,6 +160,8 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'):
++            return
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
+         for conf_file in cloud_sample_files:
+             provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file
+@@ -176,6 +180,9 @@ class ConfTest(TestCase):
+         commented out. This test loops through all of the files in that directory to check
+         for any lines that are not commented or blank.
+         '''
++        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'):
++            return
++
+         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
+         for conf_file in cloud_sample_files:
+             map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file