diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:47:05 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2022-03-31 09:47:13 -0700 |
| commit | 5115f6b373c7956cbd7659fb9c852bad7902dbb1 (patch) | |
| tree | 2429d904f8d10ff05b50fe31139e546a2312b702 /app-admin/salt/files | |
| parent | games-puzzle/five-or-more: Version bump to 3.32.3 (diff) | |
| download | gentoo-5115f6b373c7956cbd7659fb9c852bad7902dbb1.tar.gz gentoo-5115f6b373c7956cbd7659fb9c852bad7902dbb1.tar.bz2 gentoo-5115f6b373c7956cbd7659fb9c852bad7902dbb1.zip | |
app-admin/salt: add 3002.8
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-admin/salt/files')
| -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 |
2 files changed, 44 insertions, 0 deletions
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 new file mode 100644 index 000000000000..e42a22b4e8b7 --- /dev/null +++ b/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000000..c94a0c106347 --- /dev/null +++ b/app-admin/salt/files/salt-3002.8-tests.patch @@ -0,0 +1,33 @@ +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): |