commit: 561feb61da662200590994ec719372d3991c4094 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jun 30 17:48:13 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Fri Jul 1 07:34:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561feb61
app-admin/salt: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1802 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-admin/salt/files/api-initd-3 | 14 --- app-admin/salt/files/master-initd-3 | 14 --- app-admin/salt/files/minion-initd-3 | 15 --- .../salt/files/salt-2014.7.5-archive-test.patch | 15 --- .../salt/files/salt-2015.5.0-archive-test.patch | 15 --- ...alt-2015.5.1-skip-libvirt-test-on-nonroot.patch | 20 ---- .../salt-2015.8.0-remove-pydsl-includes-test.patch | 107 --------------------- .../salt/files/salt-2015.8.4-boto-vpc-test.patch | 13 --- app-admin/salt/files/syndic-initd-3 | 14 --- 9 files changed, 227 deletions(-) diff --git a/app-admin/salt/files/api-initd-3 b/app-admin/salt/files/api-initd-3 deleted file mode 100644 index 8a6f026..0000000 --- a/app-admin/salt/files/api-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-api" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-api.pid" -name="SALT API daemon" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/master-initd-3 b/app-admin/salt/files/master-initd-3 deleted file mode 100644 index c0cfead..0000000 --- a/app-admin/salt/files/master-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-master" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-master.pid" -name="SALT master daemon" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/minion-initd-3 b/app-admin/salt/files/minion-initd-3 deleted file mode 100644 index 2a1aa12..0000000 --- a/app-admin/salt/files/minion-initd-3 +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-minion" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-minion.pid" -name="SALT minion daemon" - -depend() { - need net - use logger -} diff --git a/app-admin/salt/files/salt-2014.7.5-archive-test.patch b/app-admin/salt/files/salt-2014.7.5-archive-test.patch deleted file mode 100644 index f7ff561..0000000 --- a/app-admin/salt/files/salt-2014.7.5-archive-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index a7f3005..bb0bc45 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/app-admin/salt/files/salt-2015.5.0-archive-test.patch b/app-admin/salt/files/salt-2015.5.0-archive-test.patch deleted file mode 100644 index c474223..0000000 --- a/app-admin/salt/files/salt-2015.5.0-archive-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch deleted file mode 100644 index acb8a09..0000000 --- a/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/states/libvirt_test.py b/tests/unit/states/libvirt_test.py -index ec09542..477e5c3 100644 ---- a/tests/unit/states/libvirt_test.py -+++ b/tests/unit/states/libvirt_test.py -@@ -4,6 +4,7 @@ - ''' - # Import Python libs - from __future__ import absolute_import -+import os - - # Import Salt Testing Libs - from salttesting import skipIf, TestCase -@@ -27,6 +28,7 @@ libvirt.__opts__ = {} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) -+@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test') - class LibvirtTestCase(TestCase): - ''' - Test cases for salt.states.libvirt diff --git a/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch deleted file mode 100644 index 469e0d2..0000000 --- a/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py -index 2f39a41..2052f55 100644 ---- a/tests/unit/pydsl_test.py -+++ b/tests/unit/pydsl_test.py -@@ -445,102 +445,6 @@ class PyDSLRendererTestCase(CommonTestCaseBoilerplate): - shutil.rmtree(dirpath, ignore_errors=True) - - --class PyDSLRendererIncludeTestCase(CommonTestCaseBoilerplate): -- -- def test_rendering_includes(self): -- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) -- if not os.path.isdir(dirpath): -- self.skipTest( -- 'The temporary directory {0!r} was not created'.format( -- dirpath -- ) -- ) -- output = os.path.join(dirpath, 'output') -- try: -- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- yyy = include('yyy') -- -- # ensure states in xxx are run first, then those in yyy and then those in aaa last. -- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) -- extend(state('.start').stateconf.require(stateconf='yyy::goal')) -- -- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) -- -- __pydsl__.set(ordered=True) -- -- yyy.hello('red', 1) -- yyy.hello('green', 2) -- yyy.hello('blue', 3) -- '''.format(output))) -- -- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ -- #!stateconf -os yaml . jinja -- -- include: -- - yyy -- -- extend: -- yyy::start: -- stateconf.set: -- - require: -- - stateconf: .goal -- -- yyy::Y1: -- cmd.run: -- - name: 'echo Y1 extended >> {0}' -- -- .X1: -- cmd.run: -- - name: echo X1 >> {1} -- - cwd: / -- .X2: -- cmd.run: -- - name: echo X2 >> {2} -- - cwd: / -- .X3: -- cmd.run: -- - name: echo X3 >> {3} -- - cwd: / -- -- '''.format(output, output, output, output))) -- -- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- __pydsl__.set(ordered=True) -- -- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') -- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') -- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') -- -- def hello(color, number): -- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') -- '''.format(output, output, output, output))) -- -- self.state_highstate({'base': ['aaa']}, dirpath) -- expected = textwrap.dedent('''\ -- X1 -- X2 -- X3 -- Y1 extended -- Y2 extended -- Y3 -- hello red 1 -- hello green 2 -- hello blue 3 -- ''') -- -- with salt.utils.fopen(output, 'r') as f: -- self.assertEqual(sorted(f.read()), sorted(expected)) -- -- finally: -- shutil.rmtree(dirpath, ignore_errors=True) -- -- - def write_to(fpath, content): - with salt.utils.fopen(fpath, 'w') as f: - f.write(content) diff --git a/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch b/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch deleted file mode 100644 index ca18f47..0000000 --- a/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py -index 0768790..bb89d47 100644 ---- a/tests/unit/modules/boto_vpc_test.py -+++ b/tests/unit/modules/boto_vpc_test.py -@@ -493,7 +493,7 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): - - vpc_properties = dict(id=vpc.id, - cidr_block=six.text_type(cidr_block), -- is_default=False, -+ is_default=None, - state=u'available', - tags={u'Name': u'test', u'test': u'testvalue'}, - dhcp_options_id=u'dopt-7a8b9c2d', diff --git a/app-admin/salt/files/syndic-initd-3 b/app-admin/salt/files/syndic-initd-3 deleted file mode 100644 index 5e9339b..0000000 --- a/app-admin/salt/files/syndic-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-syndic" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-syndic.pid" -name="SALT syndic daemon" - -depend() { - use net logger -}
