diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 18:21:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-10 18:21:11 +0000 |
commit | 1fe49f5b3e13481832866b6b1600741bf3a1f024 (patch) | |
tree | 798fe4fb7ef373a92cfafe1a9c5a7954181c7213 /app-admin/salt/files | |
parent | 79e2fe7ce5d8192f7ddc9f57d4fb11bd1231f041 (diff) |
gentoo auto-resync : 10:01:2023 - 18:21:10
Diffstat (limited to 'app-admin/salt/files')
-rw-r--r-- | app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch | 20 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch | 38 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3002.5-tests.patch | 30 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3002.7-tests.patch | 12 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch | 11 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3002.8-tests.patch | 33 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3003.3-tests.patch | 233 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch | 12 | ||||
-rw-r--r-- | app-admin/salt/files/salt-3003.4-tests.patch | 52 |
9 files changed, 0 insertions, 441 deletions
diff --git a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch deleted file mode 100644 index d0172d739554..000000000000 --- a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py -index be26b3f093..ca971556d5 100644 ---- a/tests/unit/modules/test_boto_apigateway.py -+++ b/tests/unit/modules/test_boto_apigateway.py -@@ -169,6 +169,7 @@ def _has_required_botocore(): - return True - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - conn = None - -@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - self.addCleanup(delattr, self, 'conn') - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseMixin(object): - def _diff_list_dicts(self, listdict1, listdict2, sortkey): - ''' diff --git a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch deleted file mode 100644 index 5ef68dcd1803..000000000000 --- a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py -index 3ee0e2da5f..5b462f0a9e 100644 ---- a/tests/integration/files/file/base/_modules/runtests_helpers.py -+++ b/tests/integration/files/file/base/_modules/runtests_helpers.py -@@ -18,7 +18,7 @@ try: - from tests.support.runtests import RUNTIME_VARS - except ImportError: - # Salt SSH Tests -- SYS_TMP_DIR = os.path.realpath( -+ SYS_TMP_DIR = os.path.abspath( - # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long - # for unix sockets: ``error: AF_UNIX path too long`` - # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -diff --git a/tests/support/paths.py b/tests/support/paths.py -index 5f28904858..26245fadf9 100644 ---- a/tests/support/paths.py -+++ b/tests/support/paths.py -@@ -48,14 +48,12 @@ if TESTS_DIR not in sys.path: - sys.path.insert(1, TESTS_DIR) - - SYS_TMP_DIR = os.path.abspath( -- os.path.realpath( -- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -- # for unix sockets: ``error: AF_UNIX path too long`` -- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -- os.environ.get("TMPDIR", tempfile.gettempdir()) -- if not sys.platform.startswith("darwin") -- else "/tmp" -- ) -+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -+ # for unix sockets: ``error: AF_UNIX path too long`` -+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -+ os.environ.get("TMPDIR", tempfile.gettempdir()) -+ if not sys.platform.startswith("darwin") -+ else "/tmp" - ) - TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir") - TMP_ROOT_DIR = os.path.join(TMP, "rootdir") diff --git a/app-admin/salt/files/salt-3002.5-tests.patch b/app-admin/salt/files/salt-3002.5-tests.patch deleted file mode 100644 index 5a2eb43c3a42..000000000000 --- a/app-admin/salt/files/salt-3002.5-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- salt-3002.5/tests/unit/modules/test_cmdmod.py 2021-02-26 11:01:33.407219444 -0800 -+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 11:01:47.709124416 -0800 -@@ -560,6 +560,7 @@ - - self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout)) - -+ @skipIf(True, "doesn't work in sandbox") - def test_run_all_output_loglevel_debug(self): - """ - Test that specifying debug for loglevel ---- salt-3002.5//tests/unit/utils/test_thin.py 2021-02-26 13:30:47.841179546 -0800 -+++ salt-3002.5-python3_7//tests/unit/utils/test_thin.py 2021-02-26 13:41:33.681174531 -0800 -@@ -1275,6 +1275,7 @@ - @skipIf( - salt.utils.platform.is_windows(), "salt-ssh does not deploy to/from windows" - ) -+ @skipIf(True, "does not work with network-sandbox") - def test_thin_dir(self): - """ - Test the thin dir to make sure salt-call can run ---- salt-3002.5/tests/unit/modules/test_cmdmod.py 2021-02-26 13:30:48.014178373 -0800 -+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 13:43:22.395441008 -0800 -@@ -439,6 +439,7 @@ - - @skipIf(salt.utils.platform.is_windows(), "Do not run on Windows") - @skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS") -+ @skipIf(True, "does not work with network-sandbox") - def test_run_cwd_in_combination_with_runas(self): - """ - cmd.run executes command in the cwd directory diff --git a/app-admin/salt/files/salt-3002.7-tests.patch b/app-admin/salt/files/salt-3002.7-tests.patch deleted file mode 100644 index 828b7eee76eb..000000000000 --- a/app-admin/salt/files/salt-3002.7-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py -index e745f8f8c6..a2bb2a7ef2 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, "skipping broken test") - @skipIf(HAS_MOTO is False, "The moto module must be installed.") - @skipIf( - _has_required_moto() is False, diff --git a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch deleted file mode 100644 index e42a22b4e8b7..000000000000 --- a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index 77c9bd8be1..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,5 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>=19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3002.8-tests.patch b/app-admin/salt/files/salt-3002.8-tests.patch deleted file mode 100644 index c94a0c106347..000000000000 --- a/app-admin/salt/files/salt-3002.8-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/salt/transport/mixins/auth.py b/salt/transport/mixins/auth.py -index de86773750..3ca09260a0 100644 ---- a/salt/transport/mixins/auth.py -+++ b/salt/transport/mixins/auth.py -@@ -54,7 +54,7 @@ class AESPubClientMixin: - @salt.ext.tornado.gen.coroutine - def _decode_payload(self, payload): - # we need to decrypt it -- log.trace("Decoding payload: %s", payload) -+ log.debug("Decoding payload: %s", payload) - if payload["enc"] == "aes": - self._verify_master_signature(payload) - try: -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index 97bce1f10b..2ff5904b87 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -835,6 +835,7 @@ class ConfigTestCase(TestCase): - ) - - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") -+ @skipIf(True, "Broken with newer versions of jsonschema") - def test_hostname_config_validation(self): - class TestConf(schema.Schema): - item = schema.HostnameItem(title="Item", description="Item description") -@@ -2060,6 +2061,7 @@ class ConfigTestCase(TestCase): - item = schema.NotItem(item=schema.BooleanItem()) - self.assertEqual(item.serialize(), {"not": item.item.serialize()}) - -+ @skipIf(True, "Broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_not_config_validation(self): - class TestConf(schema.Schema): diff --git a/app-admin/salt/files/salt-3003.3-tests.patch b/app-admin/salt/files/salt-3003.3-tests.patch deleted file mode 100644 index 049d8c164c55..000000000000 --- a/app-admin/salt/files/salt-3003.3-tests.patch +++ /dev/null @@ -1,233 +0,0 @@ -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 diff --git a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch deleted file mode 100644 index 7585af58ab11..000000000000 --- a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index 35d9014713..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>=19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3003.4-tests.patch b/app-admin/salt/files/salt-3003.4-tests.patch deleted file mode 100644 index 93fd4214021b..000000000000 --- a/app-admin/salt/files/salt-3003.4-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index 0fc1844bc8..32346da1f6 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -34,7 +34,6 @@ import salt.utils.files - import salt.utils.path - import salt.utils.platform - import salt.utils.win_functions --import saltfactories.utils.compat - from salt.serializers import yaml - from salt.utils.immutabletypes import freeze - from tests.support.helpers import ( -@@ -465,9 +464,7 @@ def pytest_runtest_setup(item): - item._skipped_by_mark = True - pytest.skip(PRE_PYTEST_SKIP_REASON) - -- if saltfactories.utils.compat.has_unittest_attr( -- item, "__slow_test__" -- ) or item.get_closest_marker("slow_test"): -+ if item.get_closest_marker("slow_test"): - if item.config.getoption("--run-slow") is False: - item._skipped_by_mark = True - pytest.skip("Slow tests are disabled!") -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index ef7acdb7a3..22953556cb 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -1,6 +1,8 @@ - # pylint: disable=function-redefined - import copy - -+import pytest -+ - import salt.utils.json - import salt.utils.schema as schema - import salt.utils.stringutils -@@ -822,6 +824,7 @@ class ConfigTestCase(TestCase): - }, - ) - -+ @pytest.mark.skip("broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_hostname_config_validation(self): - class TestConf(schema.Schema): -@@ -2048,6 +2051,7 @@ class ConfigTestCase(TestCase): - item = schema.NotItem(item=schema.BooleanItem()) - self.assertEqual(item.serialize(), {"not": item.item.serialize()}) - -+ @pytest.mark.skip("broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_not_config_validation(self): - class TestConf(schema.Schema): |