diff options
Diffstat (limited to 'app-admin/salt/files/salt-2017.7.8-tests.patch')
-rw-r--r-- | app-admin/salt/files/salt-2017.7.8-tests.patch | 70 |
1 files changed, 0 insertions, 70 deletions
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): - ''' |