gentoo resync : 25.04.2020

1 files changed, 21 insertions, 0 deletions

diff --git a/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch b/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch
new file mode 100644
index 000000000000..b12d4231bbd8
--- /dev/null
+++ b/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch
@@ -0,0 +1,21 @@
+diff --git a/salttesting/case.py b/salttesting/case.py
+index 4918915..19e47cc 100644
+--- a/salttesting/case.py
++++ b/salttesting/case.py
+@@ -140,14 +140,14 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixIn):
+         )
+         return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True)
+ 
+-    def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None):
++    def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async_flag=False, timeout=60, config_dir=None):
+         '''
+         Execute salt-run
+         '''
+         arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(),
+                                                  arg_str,
+                                                  timeout=timeout,
+-                                                 async_flag=' --async' if async else '')
++                                                 async_flag=' --async' if async_flag else '')
+         return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr)
+ 
+     def run_run_plus(self, fun, *arg, **kwargs):