docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1473 from Anvil/event-http-headers 

Allow events daemon command to read config.json
This commit is contained in:
Joffrey F 2017-02-21 12:11:58 -08:00 committed by GitHub
parent ae8c716376 f36ef399ad
commit f9f77c4c2f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/api/daemon.py
View File

@ -54,7 +54,7 @@ class DaemonApiMixin(object):
} }
return self._stream_helper( return self._stream_helper(
self.get(self._url('/events'), params=params, stream=True), self._get(self._url('/events'), params=params, stream=True),
decode=decode decode=decode
) )

9
tests/unit/api_test.py
View File

@ -228,7 +228,8 @@ class DockerApiTest(BaseAPIClientTest):
'GET', 'GET',
url_prefix + 'events', url_prefix + 'events',
params={'since': None, 'until': None, 'filters': None}, params={'since': None, 'until': None, 'filters': None},
stream=True stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS
) )
def test_events_with_since_until(self): def test_events_with_since_until(self):
@ -247,7 +248,8 @@ class DockerApiTest(BaseAPIClientTest):
'until': ts + 10, 'until': ts + 10,
'filters': None 'filters': None
}, },
stream=True stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS
) )
def test_events_with_filters(self): def test_events_with_filters(self):
@ -265,7 +267,8 @@ class DockerApiTest(BaseAPIClientTest):
'until': None, 'until': None,
'filters': expected_filters 'filters': expected_filters
}, },
stream=True stream=True,
timeout=DEFAULT_TIMEOUT_SECONDS
) )
def _socket_path_for_client_session(self, client): def _socket_path_for_client_session(self, client):