forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Patrick McLean <[email protected]>
- Loading branch information
Showing
3 changed files
with
436 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,233 @@ | ||
diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py | ||
index 29210d7522..4fd648116f 100644 | ||
--- a/salt/transport/ipc.py | ||
+++ b/salt/transport/ipc.py | ||
@@ -2,7 +2,6 @@ | ||
IPC transport classes | ||
""" | ||
|
||
- | ||
import errno | ||
import logging | ||
import socket | ||
@@ -20,6 +19,7 @@ from salt.ext.tornado.ioloop import IOLoop | ||
from salt.ext.tornado.ioloop import TimeoutError as TornadoTimeoutError | ||
from salt.ext.tornado.iostream import IOStream, StreamClosedError | ||
from salt.ext.tornado.locks import Lock | ||
+import tornado.iostream | ||
|
||
log = logging.getLogger(__name__) | ||
|
||
@@ -693,11 +693,11 @@ class IPCMessageSubscriber(IPCClient): | ||
if not first_sync_msg: | ||
# We read at least one piece of data and we're on sync run | ||
break | ||
- except TornadoTimeoutError: | ||
+ except TornadoTimeoutError if isinstance(TornadoTimeoutError, BaseException) else (salt.ext.tornado.ioloop.TimeoutError): | ||
# In the timeout case, just return None. | ||
# Keep 'self._read_stream_future' alive. | ||
ret = None | ||
- except StreamClosedError as exc: | ||
+ except StreamClosedError if isinstance(StreamClosedError, BaseException) else (tornado.iostream.StreamClosedError) as exc: | ||
log.trace("Subscriber disconnected from IPC %s", self.socket_path) | ||
self._read_stream_future = None | ||
except Exception as exc: # pylint: disable=broad-except | ||
diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py | ||
index 5f1cf11e24..8affb398ff 100644 | ||
--- a/tests/integration/grains/test_core.py | ||
+++ b/tests/integration/grains/test_core.py | ||
@@ -21,6 +21,7 @@ def _freebsd_or_openbsd(): | ||
return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd() | ||
|
||
|
||
+@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD") | ||
@pytest.mark.windows_whitelisted | ||
class TestGrainsCore(ModuleCase): | ||
""" | ||
diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py | ||
index 2321689ef5..574de51e56 100644 | ||
--- a/tests/integration/states/test_x509.py | ||
+++ b/tests/integration/states/test_x509.py | ||
@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== | ||
first_run[key]["changes"]["Certificate"]["New"]["Not After"], | ||
"%Y-%m-%d %H:%M:%S", | ||
) | ||
- self.assertEqual(29, (expiry - datetime.datetime.now()).days) | ||
+ self.assertEqual(30, (expiry - datetime.datetime.now()).days) | ||
self.assertTrue(os.path.exists(crtfile), "Certificate was not created.") | ||
|
||
with salt.utils.files.fopen(crtfile, "r") as first_cert: | ||
@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== | ||
}, | ||
) | ||
self.assertEqual( | ||
- "Certificate needs renewal: 29 days remaining but it needs to be at least 90", | ||
+ "Certificate needs renewal: 30 days remaining but it needs to be at least 90", | ||
second_run[key]["changes"]["Status"]["Old"], | ||
) | ||
expiry = datetime.datetime.strptime( | ||
second_run[key]["changes"]["Certificate"]["New"]["Not After"], | ||
"%Y-%m-%d %H:%M:%S", | ||
) | ||
- self.assertEqual(179, (expiry - datetime.datetime.now()).days) | ||
+ self.assertEqual(180, (expiry - datetime.datetime.now()).days) | ||
with salt.utils.files.fopen(crtfile, "r") as second_cert: | ||
self.assertNotEqual( | ||
cert_contents, | ||
diff --git a/tests/pytests/functional/modules/state/requisites/test_listen.py b/tests/pytests/functional/modules/state/requisites/test_listen.py | ||
index b7a90d0ca0..26030f403b 100644 | ||
--- a/tests/pytests/functional/modules/state/requisites/test_listen.py | ||
+++ b/tests/pytests/functional/modules/state/requisites/test_listen.py | ||
@@ -292,43 +292,3 @@ def test_listen_requisite_resolution_names(state, state_tree): | ||
assert "test_|-listener_service_|-nginx_|-mod_watch" in ret | ||
assert "test_|-listener_service_|-crond_|-mod_watch" in ret | ||
|
||
- | ||
-def test_onlyif_req(state, subtests): | ||
- onlyif = [{}] | ||
- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_with_changes" | ||
- with subtests.test(onlyif=onlyif): | ||
- ret = state.single( | ||
- name="onlyif test", fun="test.succeed_with_changes", onlyif=onlyif | ||
- ) | ||
- assert ret[state_id]["result"] is True | ||
- assert ret[state_id]["comment"] == "Success!" | ||
- | ||
- onlyif = [{"fun": "test.true"}] | ||
- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_without_changes" | ||
- with subtests.test(onlyif=onlyif): | ||
- ret = state.single( | ||
- name="onlyif test", fun="test.succeed_without_changes", onlyif=onlyif | ||
- ) | ||
- assert ret[state_id]["result"] is True | ||
- assert not ret[state_id]["changes"] | ||
- assert ret[state_id]["comment"] == "Success!" | ||
- | ||
- onlyif = [{"fun": "test.false"}] | ||
- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" | ||
- with subtests.test(onlyif=onlyif): | ||
- ret = state.single( | ||
- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif | ||
- ) | ||
- assert ret[state_id]["result"] is True | ||
- assert not ret[state_id]["changes"] | ||
- assert ret[state_id]["comment"] == "onlyif condition is false" | ||
- | ||
- onlyif = [{"fun": "test.true"}] | ||
- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" | ||
- with subtests.test(onlyif=onlyif): | ||
- ret = state.single( | ||
- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif | ||
- ) | ||
- assert ret[state_id]["result"] is False | ||
- assert ret[state_id]["changes"] | ||
- assert ret[state_id]["comment"] == "Failure!" | ||
diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py | ||
index 5424514160..0564b59593 100644 | ||
--- a/tests/pytests/unit/modules/test_cmdmod.py | ||
+++ b/tests/pytests/unit/modules/test_cmdmod.py | ||
@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154(): | ||
|
||
@pytest.mark.skip_on_darwin | ||
@pytest.mark.skip_on_windows | ||
+@pytest.mark.skip("does not work in sandbox environment") | ||
def test_run_cwd_in_combination_with_runas(): | ||
""" | ||
cmd.run executes command in the cwd directory | ||
diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py | ||
index 3b91757a03..5fa0f88e78 100644 | ||
--- a/tests/unit/ext/test_ipaddress.py | ||
+++ b/tests/unit/ext/test_ipaddress.py | ||
@@ -2707,6 +2707,7 @@ class IpaddrUnitTest(TestCase): | ||
"2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff", | ||
) | ||
|
||
+ @pytest.mark.skip("_cache no longer present in python3.8+") | ||
def testNetworkElementCaching(self): | ||
# V4 - make sure we're empty | ||
self.assertNotIn("broadcast_address", self.ipv4_network._cache) | ||
diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py | ||
index e745f8f8c6..ab36a90a79 100644 | ||
--- a/tests/unit/modules/test_boto_route53.py | ||
+++ b/tests/unit/modules/test_boto_route53.py | ||
@@ -80,6 +80,7 @@ def _has_required_moto(): | ||
return True | ||
|
||
|
||
+@skipIf(True, "test case appears to be broken") | ||
@skipIf(HAS_MOTO is False, "The moto module must be installed.") | ||
@skipIf( | ||
_has_required_moto() is False, | ||
diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py | ||
index 907c67f477..2429d27641 100644 | ||
--- a/tests/unit/utils/test_parsers.py | ||
+++ b/tests/unit/utils/test_parsers.py | ||
@@ -5,6 +5,7 @@ | ||
import os | ||
import shutil | ||
import tempfile | ||
+import pytest | ||
|
||
import salt.config | ||
import salt.log.setup as log | ||
@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): | ||
if os.path.exists(self.log_file): | ||
os.unlink(self.log_file) | ||
|
||
+ @pytest.mark.skip("Tries to write to /var") | ||
def test_jid_option(self): | ||
jid = salt.utils.jid.gen_jid({}) | ||
args = ["--jid", jid] | ||
@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): | ||
parser.parse_args(args) | ||
assert parser.options.jid == jid | ||
|
||
+ @pytest.mark.skip("Tries to write to /var") | ||
def test_jid_option_invalid(self): | ||
jid = salt.utils.jid.gen_jid({}) + "A" | ||
args = ["--jid", jid] | ||
@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): | ||
if os.path.exists(self.ssh_log_file): | ||
os.unlink(self.ssh_log_file) | ||
|
||
+ @pytest.mark.skip("Tries to write to /var") | ||
def test_jid_option(self): | ||
jid = salt.utils.jid.gen_jid({}) | ||
args = ["--jid", jid] + self.args | ||
@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): | ||
parser.parse_args(args) | ||
assert parser.options.jid == jid | ||
|
||
+ @pytest.mark.skip("Tries to write to /var") | ||
def test_jid_option_invalid(self): | ||
jid = salt.utils.jid.gen_jid({}) + "A" | ||
args = ["--jid", jid] + self.args | ||
diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py | ||
index bf7a323e26..3c8ce3a128 100644 | ||
--- a/tests/unit/utils/test_vt.py | ||
+++ b/tests/unit/utils/test_vt.py | ||
@@ -17,6 +17,8 @@ import subprocess | ||
import sys | ||
import time | ||
|
||
+import pytest | ||
+ | ||
import salt.utils | ||
import salt.utils.files | ||
import salt.utils.platform | ||
@@ -275,6 +277,7 @@ class VTTestCase(TestCase): | ||
salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" | ||
) | ||
@fixStdOutErrFileNoIfNeeded | ||
+ @pytest.mark.skip("Does not work in sandbox environment") | ||
def test_split_multibyte_characters_unicode(self): | ||
""" | ||
Tests that the vt correctly handles multibyte characters that are | ||
@@ -342,6 +345,7 @@ class VTTestCase(TestCase): | ||
salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" | ||
) | ||
@fixStdOutErrFileNoIfNeeded | ||
+ @pytest.mark.skip("Does not work in sandbox environment") | ||
def test_split_multibyte_characters_shiftjis(self): | ||
""" | ||
Tests that the vt correctly handles multibyte characters that are |
Oops, something went wrong.