From c3cca6db8b245cf5bc278e073bb14a6691bb745a Mon Sep 17 00:00:00 2001 From: James Falcon Date: Tue, 2 Jul 2024 10:17:51 -0500 Subject: [PATCH 1/2] test: Add jsonschema guard in test_cc_ubuntu_pro.py jsonschema is still a soft dependency, so don't fail it not present. --- tests/unittests/config/test_cc_ubuntu_pro.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/unittests/config/test_cc_ubuntu_pro.py b/tests/unittests/config/test_cc_ubuntu_pro.py index f68a688f9fc..9ef10bd0713 100644 --- a/tests/unittests/config/test_cc_ubuntu_pro.py +++ b/tests/unittests/config/test_cc_ubuntu_pro.py @@ -5,7 +5,6 @@ import sys from collections import namedtuple -import jsonschema import pytest from cloudinit import subp @@ -28,6 +27,11 @@ from tests.unittests.helpers import does_not_raise, mock, skipUnlessJsonSchema from tests.unittests.util import get_cloud +try: + import jsonschema +except ImportError: + jsonschema = None + # Module path used in mocks MPATH = "cloudinit.config.cc_ubuntu_pro" From 5fbbec7e94ff7e614a8e1e19a1162acd093bf97e Mon Sep 17 00:00:00 2001 From: James Falcon Date: Tue, 2 Jul 2024 10:41:17 -0500 Subject: [PATCH 2/2] shut up mypy --- tests/unittests/config/test_cc_ubuntu_pro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/config/test_cc_ubuntu_pro.py b/tests/unittests/config/test_cc_ubuntu_pro.py index 9ef10bd0713..df47e7ae41e 100644 --- a/tests/unittests/config/test_cc_ubuntu_pro.py +++ b/tests/unittests/config/test_cc_ubuntu_pro.py @@ -30,7 +30,7 @@ try: import jsonschema except ImportError: - jsonschema = None + jsonschema = None # type: ignore # Module path used in mocks MPATH = "cloudinit.config.cc_ubuntu_pro"