app-admin/salt: Remove redundant versions

Signed-off-by: Michał Górny <mgorny@gentoo.org>

6 files changed, 0 insertions, 211 deletions

diff --git a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
deleted file mode 100644
index 5bb7a8e4c46b..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
-index f63a4896f7..54bf443d9a 100644
---- a/tests/unit/utils/extend_test.py
-+++ b/tests/unit/utils/extend_test.py
-@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
-                 shutil.rmtree(self.out, True)
-         os.chdir(self.starting_dir)
- 
--    @patch('sys.exit', MagicMock)
--    def test_run(self):
--        out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
--        self.out = out
--        year = date.today().strftime('%Y')
--        self.assertTrue(os.path.exists(out))
--        self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
--        with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
--            self.assertEqual(test_f.read(), year)
--
- if __name__ == '__main__':
-     from unit import run_tests
-     run_tests(ExtendTestCase, needs_daemon=False)
diff --git a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
deleted file mode 100644
index 47d3257df671..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
-index 9105670526..e077bc3f44 100644
---- a/tests/unit/modules/inspect_collector_test.py
-+++ b/tests/unit/modules/inspect_collector_test.py
-@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
-         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
- 
-     @patch("os.mkdir", MagicMock())
--    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)
--
--    @patch("os.mkdir", MagicMock())
-     def test_get_unmanaged_files(self):
-         '''
-         Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
deleted file mode 100644
index 1cccb158aff0..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
-index 615e6b5670..fbd24aab86 100644
---- a/tests/unit/modules/qemu_nbd_test.py
-+++ b/tests/unit/modules/qemu_nbd_test.py
-@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
-         Test if it mount the named image via qemu-nbd
-         and return the mounted roots
-         '''
-+        tmpdir = os.environ.get('TMPDIR', '/tmp')
-         mock = MagicMock(return_value=True)
-         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
-             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
-@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
-                                  'mount.mount': mock,
-                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
-                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
--                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
-+                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
- 
-     # 'clear' function tests: 1
- 
-diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
-index 5249d56747..a27ee9ab61 100644
---- a/tests/unit/utils/context_test.py
-+++ b/tests/unit/utils/context_test.py
-@@ -18,7 +18,7 @@ import salt.payload
- import salt.utils
- 
- __context__ = {'a': 'b'}
--__opts__ = {'cachedir': '/tmp'}
-+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
- 
- 
- @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
deleted file mode 100644
index 3e4fa31c9042..000000000000
--- a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
-index fc13bb6..6316fb5 100644
---- a/tests/integration/__init__.py
-+++ b/tests/integration/__init__.py
-@@ -77,12 +77,7 @@ if salt.utils.is_windows():
-     import win32api
- 
- 
--SYS_TMP_DIR = os.path.realpath(
--    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
--    # for unix sockets: ``error: AF_UNIX path too long``
--    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
--    os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
--)
-+SYS_TMP_DIR = os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
- TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
- FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
- PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
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
deleted file mode 100644
index dd542d630adf..000000000000
--- a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/app-admin/salt/files/salt-2017.7.8-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch
deleted file mode 100644
index e428108c4614..000000000000
--- a/app-admin/salt/files/salt-2017.7.8-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index 23f3b26874..bf0b55c385 100644
---- a/tests/unit/fileserver/test_roots.py
-+++ b/tests/unit/fileserver/test_roots.py
-@@ -173,16 +173,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
-         ret = roots.dir_list({'saltenv': 'base'})
-         self.assertIn('empty_dir', ret)
- 
--    def test_symlink_list(self):
--        orig_file_roots = self.opts['file_roots']
--        try:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = self.test_symlink_list_file_roots
--            ret = roots.symlink_list({'saltenv': 'base'})
--            self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
--        finally:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = orig_file_roots
- 
- 
- class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
-diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
-index c2a86d9e5e..421cab9b52 100644
---- a/tests/unit/modules/test_inspect_collector.py
-+++ b/tests/unit/modules/test_inspect_collector.py
-@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase):
-             inspector.pidfile,
-             os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
- 
--    def test_file_tree(self):
--        '''
--        Test file tree.
--
--        :return:
--        '''
--
--        inspector = Inspector(cachedir=os.sep + 'test',
--                              piddir=os.sep + 'test',
--                              pidfilename='bar.pid')
--        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
--        expected_tree = ([os.sep + os.sep.join(['a', 'a', 'dummy.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.b']),
--                          os.sep + os.sep.join(['b', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.2']),
--                          os.sep + os.sep.join(['b', 'b.3'])],
--                         [os.sep + 'a',
--                          os.sep + os.sep.join(['a', 'a']),
--                          os.sep + os.sep.join(['a', 'b']),
--                          os.sep + os.sep.join(['a', 'c']),
--                          os.sep + 'b',
--                          os.sep + 'c'],
--                         [os.sep + os.sep.join(['a', 'a', 'dummy.ln.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.ln.b']),
--                          os.sep + os.sep.join(['a', 'c', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.4']),
--                          os.sep + os.sep.join(['b', 'b.5']),
--                          os.sep + os.sep.join(['c', 'b.1']),
--                          os.sep + os.sep.join(['c', 'b.2']),
--                          os.sep + os.sep.join(['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):
-         '''