diff options
Diffstat (limited to 'app-admin/salt/files/salt-3000.1-tests.patch')
-rw-r--r-- | app-admin/salt/files/salt-3000.1-tests.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/app-admin/salt/files/salt-3000.1-tests.patch b/app-admin/salt/files/salt-3000.1-tests.patch new file mode 100644 index 000000000000..12a2e7822b94 --- /dev/null +++ b/app-admin/salt/files/salt-3000.1-tests.patch @@ -0,0 +1,58 @@ +diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py +index e0d939a086..33a9b6dc35 100644 +--- a/tests/unit/fileserver/test_roots.py ++++ b/tests/unit/fileserver/test_roots.py +@@ -11,7 +11,7 @@ import tempfile + + # Import Salt Testing libs + from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin +-from tests.support.unit import TestCase ++from tests.support.unit import TestCase, skipIf + from tests.support.mock import patch + from tests.support.runtests import RUNTIME_VARS + +@@ -165,6 +165,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix + self.assertIn('empty_dir', ret) + self.assertIn(UNICODE_DIRNAME, ret) + ++ @skipIf(True, "doesn't like sandbox") + def test_symlink_list(self): + orig_file_roots = self.opts['file_roots'] + try: +diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py +index 191bfc123f..1956127f0b 100644 +--- a/tests/unit/modules/test_dockermod.py ++++ b/tests/unit/modules/test_dockermod.py +@@ -793,6 +793,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin): + }, + ret) + ++ @skipIf(True, "Doesn't work with sandbox") + def test_call_success(self): + ''' + test module calling inside containers +diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py +index 13c158b309..27e10e6161 100644 +--- a/tests/unit/states/test_pip_state.py ++++ b/tests/unit/states/test_pip_state.py +@@ -384,6 +384,7 @@ class PipStateUtilsTest(TestCase): + + + @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed') ++@skipIf(True, "Needs network access") + class PipStateInstallationErrorTest(TestCase): + + def test_importable_installation_error(self): +diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py +index f48fa9d42c..bb57929cfa 100644 +--- a/tests/unit/utils/test_jinja.py ++++ b/tests/unit/utils/test_jinja.py +@@ -1268,7 +1268,7 @@ class TestCustomExtensions(TestCase): + dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) + self.assertEqual(rendered, '16777216') + +- @flaky ++ @skipIf("True", "Needs network access") + def test_http_query(self): + ''' + Test the `http_query` Jinja filter. |