From 3c3c5179586f4ceebd70f0fee7e127f636b1c1af Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 28 Mar 2024 09:10:33 +0100 Subject: tests: Replace imp with importlib.machinery It's needed for Python3.12 support, because imp has been dropped [1]. Also shlex dropped s=None support [2]. [1]: https://docs.python.org/3/whatsnew/3.12.html [2]: https://github.com/python/cpython/issues/94352 Change-Id: I23f37897ea08ac708f6df485f699122df647e552 --- tests/kolla_container_tests/test_docker_worker.py | 6 +++--- tests/kolla_container_tests/test_podman_worker.py | 6 +++--- tests/kolla_container_tests/test_systemd.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'tests/kolla_container_tests') diff --git a/tests/kolla_container_tests/test_docker_worker.py b/tests/kolla_container_tests/test_docker_worker.py index 7c7909e6a..dc3064c08 100644 --- a/tests/kolla_container_tests/test_docker_worker.py +++ b/tests/kolla_container_tests/test_docker_worker.py @@ -15,7 +15,7 @@ import copy -import imp +from importlib.machinery import SourceFileLoader import os import sys from unittest import mock @@ -32,8 +32,8 @@ kolla_container_file = os.path.join(ansible_dir, 'library', 'kolla_container.py') docker_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_docker_worker.py') -kc = imp.load_source('kolla_container', kolla_container_file) -dwm = imp.load_source('kolla_docker_worker', docker_worker_file) +kc = SourceFileLoader('kolla_container', kolla_container_file).load_module() +dwm = SourceFileLoader('kolla_docker_worker', docker_worker_file).load_module() FAKE_DATA = { diff --git a/tests/kolla_container_tests/test_podman_worker.py b/tests/kolla_container_tests/test_podman_worker.py index 6767a9100..e1fd358a8 100644 --- a/tests/kolla_container_tests/test_podman_worker.py +++ b/tests/kolla_container_tests/test_podman_worker.py @@ -14,7 +14,7 @@ import copy -import imp +from importlib.machinery import SourceFileLoader import os import sys import unittest @@ -31,8 +31,8 @@ kolla_container_file = os.path.join(ansible_dir, 'library', 'kolla_container.py') podman_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_podman_worker.py') -kc = imp.load_source('kolla_container', kolla_container_file) -pwm = imp.load_source('kolla_podman_worker', podman_worker_file) +kc = SourceFileLoader('kolla_container', kolla_container_file).load_module() +pwm = SourceFileLoader('kolla_podman_worker', podman_worker_file).load_module() FAKE_DATA = { 'params': { diff --git a/tests/kolla_container_tests/test_systemd.py b/tests/kolla_container_tests/test_systemd.py index 9f2b624f0..b1a2b6fde 100644 --- a/tests/kolla_container_tests/test_systemd.py +++ b/tests/kolla_container_tests/test_systemd.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import imp +from importlib.machinery import SourceFileLoader import os import sys from unittest import mock @@ -26,7 +26,8 @@ this_dir = os.path.dirname(sys.modules[__name__].__file__) ansible_dir = os.path.join(this_dir, '..', '..', 'ansible') systemd_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_systemd_worker.py') -swm = imp.load_source('kolla_systemd_worker', systemd_worker_file) +swm = SourceFileLoader('kolla_systemd_worker', + systemd_worker_file).load_module() class TestSystemd(base.BaseTestCase): -- cgit v1.2.3