From 6941f1c36c8e90fe83166553ec76e7d6d68caa41 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Mon, 26 Jul 2021 15:04:30 +0200 Subject: [PATCH] Fix issue when parsing podman/docker version output Added IGNORECASE to the regex matching because parsing did not work fine in some cases Change-Id: I8be90c969f52ac800f774a92e3cd5432701c2312 --- tobiko/tests/functional/shell/test_ps.py | 2 +- tobiko/tripleo/containers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tobiko/tests/functional/shell/test_ps.py b/tobiko/tests/functional/shell/test_ps.py index afab077bc..50d0ae046 100644 --- a/tobiko/tests/functional/shell/test_ps.py +++ b/tobiko/tests/functional/shell/test_ps.py @@ -66,7 +66,7 @@ class LocalPsTest(testtools.TestCase): processes = sh.list_processes(command_line='cat -', ssh_client=self.ssh_client) for process in processes: - self.assertTrue('cat', process.command) + self.assertEqual('cat', process.command) self.assertEqual(('cat', '-'), process.command_line) cat_process.kill() sh.wait_for_processes(command_line='cat -', diff --git a/tobiko/tripleo/containers.py b/tobiko/tripleo/containers.py index fe2c63644..4cb115e3d 100644 --- a/tobiko/tripleo/containers.py +++ b/tobiko/tripleo/containers.py @@ -60,7 +60,7 @@ class ContainerRuntime(abc.ABC): class DockerContainerRuntime(ContainerRuntime): runtime_name = 'docker' - version_pattern = re.compile('Docker version .*') + version_pattern = re.compile('Docker version .*', re.IGNORECASE) def _get_client(self, ssh_client): return docker.get_docker_client(ssh_client=ssh_client, @@ -73,7 +73,7 @@ class DockerContainerRuntime(ContainerRuntime): class PodmanContainerRuntime(ContainerRuntime): runtime_name = 'podman' - version_pattern = re.compile('Podman version .*') + version_pattern = re.compile('Podman version .*', re.IGNORECASE) def _get_client(self, ssh_client): return podman.get_podman_client(ssh_client=ssh_client).connect()