ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 03:46:55 +00:00
Code Packages Projects Releases Wiki Activity

Avoid six in plugin code. (#1137)

Browse Source
This commit is contained in:
Felix Fontein
2025-10-04 21:51:59 +02:00
committed by GitHub
parent de9794ffe8
commit 1902e0fdf2
7 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/plugins/connection/test_docker.py
+2 -5
View File
@@ -14,7 +14,6 @@ from ansible_collections.community.internal_test_tools.tests.unit.compat import
from ansible.errors import AnsibleError
from ansible.playbook.play_context import PlayContext
from ansible.plugins.loader import connection_loader
from ansible.module_utils.six import PY2
class TestDockerConnectionClass(unittest.TestCase):
@@ -38,8 +37,7 @@ class TestDockerConnectionClass(unittest.TestCase):
def test_docker_connection_module_too_old(self, mock_new_docker_version, mock_old_docker_version):
self.dc._version = None
self.dc.remote_user = 'foo'
(self.assertRaisesRegexp if PY2 else self.assertRaisesRegex)(
AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user)
self.assertRaisesRegex(AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user)
@mock.patch('ansible_collections.community.docker.plugins.connection.docker.Connection._old_docker_version',
return_value=('false', 'garbage', '', 1))
@@ -57,5 +55,4 @@ class TestDockerConnectionClass(unittest.TestCase):
def test_docker_connection_module_wrong_cmd(self, mock_new_docker_version, mock_old_docker_version):
self.dc._version = None
self.dc.remote_user = 'foo'
(self.assertRaisesRegexp if PY2 else self.assertRaisesRegex)(
AnsibleError, '^Docker version check (.*?) failed:', self.dc._get_actual_user)
self.assertRaisesRegex(AnsibleError, '^Docker version check (.*?) failed:', self.dc._get_actual_user)