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

Add a couple more patches for docker.version information

Browse source
This commit is contained in:
rallytime 2017-03-23 12:57:46 -06:00
parent a9c5eebaf0
commit 0d31d2c4d1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/modules/dockerng_test.py
View file

@ -97,7 +97,7 @@ class DockerngTestCase(TestCase):
mine_send.assert_called_with('dockerng.ps', verbose=True, all=True,
host=True)
@skipIf(docker_version() < (1, 4, 0),
@skipIf(docker_version < (1, 4, 0),
'docker module must be installed to run this test or is too old. >=1.4.0')
@patch.object(dockerng_mod, 'images', MagicMock())
@patch.object(dockerng_mod, 'inspect_image')
@ -350,6 +350,8 @@ class DockerngTestCase(TestCase):
@skipIf(docker_version < (1, 5, 0),
'docker module must be installed to run this test or is too old. >=1.5.0')
@patch('salt.modules.dockerng._get_docker_py_versioninfo',
MagicMock(return_value=docker_version))
def test_remove_network(self, *args):
'''
test remove network.
@ -415,6 +417,8 @@ class DockerngTestCase(TestCase):
@skipIf(docker_version < (1, 5, 0),
'docker module must be installed to run this test or is too old. >=1.5.0')
@patch('salt.modules.dockerng._get_docker_py_versioninfo',
MagicMock(return_value=docker_version))
def test_disconnect_container_from_network(self, *args):
'''
test inspect network.