diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2018-10-24 13:36:12 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2018-10-24 15:59:00 -0700 |
| commit | 9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6 (patch) | |
| tree | 3d534904ec6afc1e80693172372378dbea9eaf8d /app-admin/salt/files | |
| parent | app-admin/salt: Version bump to 2016.11.10 (diff) | |
| download | gentoo-9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6.tar.gz gentoo-9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6.tar.bz2 gentoo-9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6.zip | |
app-admin/salt: Version bump to 2017.7.8
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'app-admin/salt/files')
| -rw-r--r-- | app-admin/salt/files/salt-2017.7.8-tests.patch (renamed from app-admin/salt/files/salt-2017.7.3-tests.patch) | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/app-admin/salt/files/salt-2017.7.3-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch index 9399bf873349..e428108c4614 100644 --- a/app-admin/salt/files/salt-2017.7.3-tests.patch +++ b/app-admin/salt/files/salt-2017.7.8-tests.patch @@ -1,25 +1,29 @@ diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py -index cc9c8dbce9..a50a240c25 100644 +index 23f3b26874..bf0b55c385 100644 --- a/tests/unit/fileserver/test_roots.py +++ b/tests/unit/fileserver/test_roots.py -@@ -164,12 +164,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix +@@ -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): -- 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'}) -- +- 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): + class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin): diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py -index 0d37519a9e..c18be8d592 100644 +index c2a86d9e5e..421cab9b52 100644 --- a/tests/unit/modules/test_inspect_collector.py +++ b/tests/unit/modules/test_inspect_collector.py -@@ -59,44 +59,6 @@ class InspectorCollectorTestCase(TestCase): +@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase): inspector.pidfile, os.sep + os.sep.join(['foo', 'pid', 'bar.pid'])) |