From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- app-admin/salt/files/salt-2018.3.4-tests.patch | 76 ++++++++++++++++++++++++++ app-admin/salt/files/salt-2019.2.0-tests.patch | 73 +++++++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 app-admin/salt/files/salt-2018.3.4-tests.patch create mode 100644 app-admin/salt/files/salt-2019.2.0-tests.patch (limited to 'app-admin/salt/files') diff --git a/app-admin/salt/files/salt-2018.3.4-tests.patch b/app-admin/salt/files/salt-2018.3.4-tests.patch new file mode 100644 index 000000000000..ac3dbb845348 --- /dev/null +++ b/app-admin/salt/files/salt-2018.3.4-tests.patch @@ -0,0 +1,76 @@ +diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py +index 3874b0001c..40304075eb 100644 +--- a/tests/unit/grains/test_core.py ++++ b/tests/unit/grains/test_core.py +@@ -685,22 +685,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): + 'Docker' + ) + +- @skipIf(salt.utils.platform.is_windows(), 'System is Windows') +- def test_xen_virtual(self): +- ''' +- Test if OS grains are parsed correctly in Ubuntu Xenial Xerus +- ''' +- with patch.object(os.path, 'isfile', MagicMock(return_value=False)): +- with patch.dict(core.__salt__, {'cmd.run': MagicMock(return_value='')}), \ +- patch.object(os.path, +- 'isfile', +- MagicMock(side_effect=lambda x: True if x == '/sys/bus/xen/drivers/xenconsole' else False)): +- log.debug('Testing Xen') +- self.assertEqual( +- core._virtual({'kernel': 'Linux'}).get('virtual_subtype'), +- 'Xen PV DomU' +- ) +- + def _check_ipaddress(self, value, ip_v): + ''' + check if ip address in a list is valid +diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py +index 694a7aebfe..9e22c278e9 100644 +--- a/tests/unit/utils/test_asynchronous.py ++++ b/tests/unit/utils/test_asynchronous.py +@@ -35,19 +35,6 @@ class HelperB(object): + + + class TestSyncWrapper(AsyncTestCase): +- @tornado.testing.gen_test +- def test_helpers(self): +- ''' +- Test that the helper classes do what we expect within a regular asynchronous env +- ''' +- ha = HelperA() +- ret = yield ha.sleep() +- self.assertTrue(ret) +- +- hb = HelperB() +- ret = yield hb.sleep() +- self.assertFalse(ret) +- + def test_basic_wrap(self): + ''' + Test that we can wrap an asynchronous caller. +@@ -55,24 +42,3 @@ class TestSyncWrapper(AsyncTestCase): + sync = asynchronous.SyncWrapper(HelperA) + ret = sync.sleep() + self.assertTrue(ret) +- +- def test_double(self): +- ''' +- Test when the asynchronous wrapper object itself creates a wrap of another thing +- +- This works fine since the second wrap is based on the first's IOLoop so we +- don't have to worry about complex start/stop mechanics +- ''' +- sync = asynchronous.SyncWrapper(HelperB) +- ret = sync.sleep() +- self.assertFalse(ret) +- +- def test_double_sameloop(self): +- ''' +- Test asynchronous wrappers initiated from the same IOLoop, to ensure that +- we don't wire up both to the same IOLoop (since it causes MANY problems). +- ''' +- a = asynchronous.SyncWrapper(HelperA) +- sync = asynchronous.SyncWrapper(HelperB, (a,)) +- ret = sync.sleep() +- self.assertFalse(ret) diff --git a/app-admin/salt/files/salt-2019.2.0-tests.patch b/app-admin/salt/files/salt-2019.2.0-tests.patch new file mode 100644 index 000000000000..830fcbffe367 --- /dev/null +++ b/app-admin/salt/files/salt-2019.2.0-tests.patch @@ -0,0 +1,73 @@ +diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py +index 4e93df4e62..38c13efb6b 100644 +--- a/tests/unit/fileserver/test_gitfs.py ++++ b/tests/unit/fileserver/test_gitfs.py +@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin): + if exc.errno != errno.EEXIST: + raise + ++ @skipIf(True, 'currently failing on Gentoo') + def test_per_saltenv_config(self): + opts_override = textwrap.dedent(''' + gitfs_root: salt +diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py +index 445df0c98a..17ca123172 100644 +--- a/tests/unit/grains/test_core.py ++++ b/tests/unit/grains/test_core.py +@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): + ) + + @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux') ++ @skipIf(True, 'Test assumes running under Xen') + def test_xen_virtual(self): + ''' + Test if OS grains are parsed correctly in Ubuntu Xenial Xerus +diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py +index 694a7aebfe..704f2d894f 100644 +--- a/tests/unit/utils/test_asynchronous.py ++++ b/tests/unit/utils/test_asynchronous.py +@@ -3,6 +3,8 @@ + # Import Python Libs + from __future__ import absolute_import, print_function, unicode_literals + ++from unittest import skipIf ++ + # Import 3rd-party libs + import tornado.testing + import tornado.gen +@@ -35,6 +37,7 @@ class HelperB(object): + + + class TestSyncWrapper(AsyncTestCase): ++ @skipIf(True, "fails in sandbox") + @tornado.testing.gen_test + def test_helpers(self): + ''' +@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase): + ret = sync.sleep() + self.assertTrue(ret) + ++ @skipIf(True, "fails in sandbox") + def test_double(self): + ''' + Test when the asynchronous wrapper object itself creates a wrap of another thing +@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase): + ret = sync.sleep() + self.assertFalse(ret) + ++ @skipIf(True, "fails in sandbox") + def test_double_sameloop(self): + ''' + Test asynchronous wrappers initiated from the same IOLoop, to ensure that +diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py +index da666ef4c7..e3523049b7 100644 +--- a/tests/unit/utils/test_jinja.py ++++ b/tests/unit/utils/test_jinja.py +@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase): + dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) + self.assertEqual(rendered, '16777216') + ++ @skipIf(True, 'Skipping tests that require internet access') + @flaky + def test_http_query(self): + ''' -- cgit v1.2.3