You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/app-admin/salt/files/salt-3002.8-tests.patch

34 lines
1.5 KiB

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):