github
/
docker-tidy
mirror of https://github.com/thegeeklab/docker-tidy.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from dnephin/upgrade_docker_py 

Upgrade requirements to fix #17
This commit is contained in:
Kyle Anderson 2015-09-29 13:25:23 -07:00
parent a4cc854a7f 720401c3b2
commit 52cc72d41c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker_custodian/__about__.py
View File

@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
__version_info__ = (0, 5, 0)
__version_info__ = (0, 5, 1)
__version__ = '%d.%d.%d' % __version_info__

6
requirements.txt
View File

@ -1,9 +1,9 @@
argparse==1.3.0
backports.ssl-match-hostname==3.4.0.2
docker-py==0.6.0
docker-py==1.4.0
future==0.14.3
python-dateutil==2.4.0
pytimeparse==1.1.2
requests==2.5.1
requests==2.7.0
six==1.9.0
websocket-client==0.23.0
websocket-client==0.32.0

4
tests/docker_autostop_test.py
View File

@ -53,7 +53,9 @@ def test_has_been_running_since_false(container, earlier_time):
autospec=True)
@mock.patch('docker_custodian.docker_autostop.get_opts',
autospec=True)
def test_main(mock_get_opts, mock_stop_containers, mock_build_matcher):
@mock.patch('docker_custodian.docker_autostop.docker', autospec=True)
def test_main(mock_docker, mock_get_opts, mock_stop_containers, mock_build_matcher):
mock_get_opts.return_value.timeout = 30
main()
mock_get_opts.assert_called_once_with()
mock_build_matcher.assert_called_once_with(