saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bump to docker==6.1.2

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-09-24 18:32:09 +01:00 • committed by Pedro Algarvio
parent dde485bf94
commit 9fb51b083a
24 changed files with 47 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
requirements/static/ci/py3.10/cloud.txt
View file

@ -410,7 +410,7 @@ dnspython==2.1.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==5.0.2
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -625,6 +625,7 @@ oscrypto==1.2.1
packaging==21.3
# via
# -r requirements/base.txt
# docker
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -854,6 +855,7 @@ typing-extensions==4.2.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests

2
requirements/static/ci/py3.10/darwin.txt
View file

@ -408,7 +408,7 @@ dnspython==1.16.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/freebsd.txt
View file

@ -407,7 +407,7 @@ dnspython==1.16.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/lint.txt
View file

@ -411,7 +411,7 @@ dnspython==2.1.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==5.0.0
docker==6.1.2
# via -r requirements/static/ci/lint.in
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/linux.txt
View file

@ -421,7 +421,7 @@ dnspython==1.16.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.10/pkgtests.txt
View file

@ -29,7 +29,7 @@ distro==1.8.0
# via
# -r requirements/base.txt
# pytest-skip-markers
docker==5.0.3
docker==6.1.2
# via -r requirements/static/ci/pkgtests.in
exceptiongroup==1.1.0
# via pytest

2
requirements/static/ci/py3.10/windows.txt
View file

@ -93,7 +93,7 @@ dnspython==1.16.0
# python-etcd
docker-pycreds==0.4.0
# via docker
docker==2.7.0
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

4
requirements/static/ci/py3.7/cloud.txt
View file

@ -418,7 +418,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.2
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -665,6 +665,7 @@ oscrypto==1.2.1
packaging==21.3
# via
# -r requirements/base.txt
# docker
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -917,6 +918,7 @@ typing-extensions==3.10.0.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests

2
requirements/static/ci/py3.7/freebsd.txt
View file

@ -415,7 +415,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.7/lint.txt
View file

@ -421,7 +421,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.0
docker==6.1.2
# via -r requirements/static/ci/lint.in
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.7/linux.txt
View file

@ -429,7 +429,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.7/windows.txt
View file

@ -99,7 +99,7 @@ dnspython==1.16.0
# python-etcd
docker-pycreds==0.4.0
# via docker
docker==2.7.0
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

4
requirements/static/ci/py3.8/cloud.txt
View file

@ -416,7 +416,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.2
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -653,6 +653,7 @@ oscrypto==1.2.1
packaging==21.3
# via
# -r requirements/base.txt
# docker
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -899,6 +900,7 @@ typing-extensions==3.10.0.2
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests

2
requirements/static/ci/py3.8/freebsd.txt
View file

@ -413,7 +413,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.8/lint.txt
View file

@ -419,7 +419,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.0
docker==6.1.2
# via -r requirements/static/ci/lint.in
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.8/linux.txt
View file

@ -427,7 +427,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.8/windows.txt
View file

@ -95,7 +95,7 @@ dnspython==1.16.0
# python-etcd
docker-pycreds==0.4.0
# via docker
docker==2.7.0
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

4
requirements/static/ci/py3.9/cloud.txt
View file

@ -416,7 +416,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.2
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -653,6 +653,7 @@ oscrypto==1.2.1
packaging==21.3
# via
# -r requirements/base.txt
# docker
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -902,6 +903,7 @@ typing-extensions==3.10.0.2
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests

2
requirements/static/ci/py3.9/darwin.txt
View file

@ -414,7 +414,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/freebsd.txt
View file

@ -413,7 +413,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/lint.txt
View file

@ -417,7 +417,7 @@ dnspython==2.1.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.0
docker==6.1.2
# via -r requirements/static/ci/lint.in
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/linux.txt
View file

@ -429,7 +429,7 @@ dnspython==1.16.0
# -r requirements/static/ci/common.in
# ciscoconfparse
# python-etcd
docker==5.0.3
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

2
requirements/static/ci/py3.9/windows.txt
View file

@ -95,7 +95,7 @@ dnspython==1.16.0
# python-etcd
docker-pycreds==0.4.0
# via docker
docker==2.7.0
docker==6.1.2
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in

57
tests/pytests/unit/modules/dockermod/test_module.py
View file

@ -9,14 +9,19 @@ import pytest
import salt.loader
import salt.modules.dockermod as docker_mod
import salt.utils.platform
import salt.utils.versions
from salt.exceptions import CommandExecutionError, SaltInvocationError
from tests.support.mock import MagicMock, Mock, call, patch
log = logging.getLogger(__name__)
pytest.importorskip(
docker = pytest.importorskip(
"docker", reason="The python 'docker' package must be installed to run these tests"
)
docker_older_than_1_5_0_skip_marker = pytest.mark.skipif(
salt.utils.versions.Version(docker.__version__) < "1.5.0",
reason="docker module must be installed to run this test or is too old. <=1.5.0",
)
@pytest.fixture
@ -354,10 +359,7 @@ def test_update_mine():
mine_mock.assert_called_once()
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_list_networks():
"""
test list networks.
@ -378,10 +380,7 @@ def test_list_networks():
client.networks.assert_called_once_with(names=["foo"], ids=["01234"])
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_create_network():
"""
test create network.
@ -422,10 +421,7 @@ def test_create_network():
)
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_remove_network():
"""
test remove network.
@ -444,10 +440,7 @@ def test_remove_network():
client.remove_network.assert_called_once_with("foo")
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_inspect_network():
"""
test inspect network.
@ -466,10 +459,7 @@ def test_inspect_network():
client.inspect_network.assert_called_once_with("foo")
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_connect_container_to_network():
"""
test connect_container_to_network
@ -491,10 +481,7 @@ def test_connect_container_to_network():
client.connect_container_to_network.assert_called_once_with("container", "foo")
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_disconnect_container_from_network():
"""
test disconnect_container_from_network
@ -513,10 +500,7 @@ def test_disconnect_container_from_network():
client.disconnect_container_from_network.assert_called_once_with("container", "foo")
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_list_volumes():
"""
test list volumes.
@ -539,10 +523,7 @@ def test_list_volumes():
)
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_create_volume():
"""
test create volume.
@ -569,10 +550,7 @@ def test_create_volume():
)
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_remove_volume():
"""
test remove volume.
@ -591,10 +569,7 @@ def test_remove_volume():
client.remove_volume.assert_called_once_with("foo")
@pytest.mark.skipif(
docker_mod.docker.version_info < (1, 5, 0),
reason="docker module must be installed to run this test or is too old. >=1.5.0",
)
@docker_older_than_1_5_0_skip_marker
def test_inspect_volume():
"""
test inspect volume.