diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2017-02-21 12:11:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 12:11:58 -0800 |
| commit | f9f77c4c2f93eefc3d80d572ec3a8337263417e3 (patch) | |
| tree | a207cd7c175d8119fd5c7942982e1411fa4c51f7 | |
| parent | ae8c7163768ab40d8b19cc317a54fbbb0a8ed77d (diff) | |
| parent | f36ef399ad127f7f5409c2c4e67c45d45b5b013b (diff) | |
| download | docker-py-f9f77c4c2f93eefc3d80d572ec3a8337263417e3.tar.gz | |
Merge pull request #1473 from Anvil/event-http-headers
Allow events daemon command to read config.json
| -rw-r--r-- | docker/api/daemon.py | 2 | ||||
| -rw-r--r-- | tests/unit/api_test.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docker/api/daemon.py b/docker/api/daemon.py index d40631f..0334584 100644 --- a/docker/api/daemon.py +++ b/docker/api/daemon.py @@ -54,7 +54,7 @@ class DaemonApiMixin(object): } return self._stream_helper( - self.get(self._url('/events'), params=params, stream=True), + self._get(self._url('/events'), params=params, stream=True), decode=decode ) diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 15e4d7c..b632d20 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -228,7 +228,8 @@ class DockerApiTest(BaseAPIClientTest): 'GET', url_prefix + 'events', params={'since': None, 'until': None, 'filters': None}, - stream=True + stream=True, + timeout=DEFAULT_TIMEOUT_SECONDS ) def test_events_with_since_until(self): @@ -247,7 +248,8 @@ class DockerApiTest(BaseAPIClientTest): 'until': ts + 10, 'filters': None }, - stream=True + stream=True, + timeout=DEFAULT_TIMEOUT_SECONDS ) def test_events_with_filters(self): @@ -265,7 +267,8 @@ class DockerApiTest(BaseAPIClientTest): 'until': None, 'filters': expected_filters }, - stream=True + stream=True, + timeout=DEFAULT_TIMEOUT_SECONDS ) def _socket_path_for_client_session(self, client): |