commit: 7a228496d70b4875c6379690e30fa4e6d99d7b04
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 18:49:18 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 18:49:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a228496
app-admin/salt: Revbump, fix tests
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-admin/salt/files/salt-3004.1-tests.patch | 20 ++++++++++++++++++++
.../{salt-3004.1-r3.ebuild => salt-3004.1-r4.ebuild} | 1 +
2 files changed, 21 insertions(+)
diff --git a/app-admin/salt/files/salt-3004.1-tests.patch
b/app-admin/salt/files/salt-3004.1-tests.patch
index 3a36977246f2..956cf1b0041c 100644
--- a/app-admin/salt/files/salt-3004.1-tests.patch
+++ b/app-admin/salt/files/salt-3004.1-tests.patch
@@ -289,3 +289,23 @@ index 907c67f477..3f68cfe8f3 100644
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_schema.py b/tests/unit/utils/test_schema.py
+index 8c648f5288..74b9bc6981 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -872,6 +872,7 @@ class ConfigTestCase(TestCase):
+ },
+ )
+
++ @skipIf(True, "Does not work in network sandbox")
+ @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
+ def test_hostname_config_validation(self):
+ class TestConf(schema.Schema):
+@@ -2098,6 +2099,7 @@ class ConfigTestCase(TestCase):
+ item = schema.NotItem(item=schema.BooleanItem())
+ self.assertEqual(item.serialize(), {"not": item.item.serialize()})
+
++ @skipIf(True, "Does not work in network sandbox")
+ @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/salt-3004.1-r3.ebuild
b/app-admin/salt/salt-3004.1-r4.ebuild
similarity index 99%
rename from app-admin/salt/salt-3004.1-r3.ebuild
rename to app-admin/salt/salt-3004.1-r4.ebuild
index d7ded011cd0a..f70d9445491a 100644
--- a/app-admin/salt/salt-3004.1-r3.ebuild
+++ b/app-admin/salt/salt-3004.1-r4.ebuild
@@ -82,6 +82,7 @@ BDEPEND="
dev-python/mako[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ dev-python/passlib
dev-python/pip[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
