gentoo resync : 25.08.2020

1 files changed, 43 insertions, 0 deletions

diff --git a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch
new file mode 100644
index 000000000000..fab9f38df771
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch
@@ -0,0 +1,43 @@
+diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py
+index e5d2c946ae..e9140670cb 100644
+--- a/tests/unit/modules/test_event.py
++++ b/tests/unit/modules/test_event.py
+@@ -47,12 +47,6 @@ class EventTestCase(TestCase, LoaderModuleMockMixin):
+             preload = {'id': 'id', 'tag': 'tag', 'data': 'data',
+                        'tok': 'salt', 'cmd': '_minion_event'}
+ 
+-            with patch.dict(event.__opts__, {'transport': 'raet',
+-                                             'local': False}):
+-                with patch.object(salt_transport_channel_factory, 'send',
+-                                  return_value=None):
+-                    self.assertTrue(event.fire_master('data', 'tag'))
+-
+             with patch.dict(event.__opts__, {'transport': 'A',
+                                              'master_uri': 'localhost',
+                                              'local': False}):
+diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
+index 63b9ae3181..2c8294ef77 100644
+--- a/tests/unit/utils/test_verify.py
++++ b/tests/unit/utils/test_verify.py
+@@ -326,7 +326,7 @@ class TestVerifyLog(TestCase):
+         verify_log_files([path], getpass.getuser())
+         self.assertTrue(os.path.exists(path))
+ 
+-
++@skipIf(True, "broken under sandbox")
+ class TestCleanPath(TestCase):
+     '''
+     salt.utils.clean_path works as expected
+@@ -396,10 +396,10 @@ class TestCleanPathLink(TestCase):
+         test_path = os.path.join(self.from_path, 'test')
+         expect_path = os.path.join(self.to_path, 'test')
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
+ 
+     def test_clean_path_symlinked_tgt(self):
+         test_path = os.path.join(self.to_path, 'test')
+         expect_path = os.path.join(self.to_path, 'test')
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)