diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch')
-rw-r--r-- | app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch | 33 |
1 files changed, 33 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. |