Unverified Kaydet (Commit) c03a009e authored tarafından Chris Mark's avatar Chris Mark

Raising error in case of invalid value of since kwarg on Container.logs

Signed-off-by: 's avatarChris Mark <chrismarkou92@gmail.com>
üst 8fc6540f
...@@ -825,6 +825,11 @@ class ContainerApiMixin(object): ...@@ -825,6 +825,11 @@ class ContainerApiMixin(object):
params['since'] = utils.datetime_to_timestamp(since) params['since'] = utils.datetime_to_timestamp(since)
elif (isinstance(since, int) and since > 0): elif (isinstance(since, int) and since > 0):
params['since'] = since params['since'] = since
else:
raise errors.InvalidArgument(
'since value should be datetime or int, not {}'.
format(type(since))
)
url = self._url("/containers/{0}/logs", container) url = self._url("/containers/{0}/logs", container)
res = self._get(url, params=params, stream=stream) res = self._get(url, params=params, stream=stream)
return self._get_result(container, stream, res) return self._get_result(container, stream, res)
......
...@@ -1421,6 +1421,13 @@ class ContainerTest(BaseAPIClientTest): ...@@ -1421,6 +1421,13 @@ class ContainerTest(BaseAPIClientTest):
stream=False stream=False
) )
def test_log_since_with_invalid_value_raises_error(self):
with mock.patch('docker.api.client.APIClient.inspect_container',
fake_inspect_container):
with self.assertRaises(docker.errors.InvalidArgument):
self.client.logs(fake_api.FAKE_CONTAINER_ID, stream=False,
follow=False, since=42.42)
def test_log_tty(self): def test_log_tty(self):
m = mock.Mock() m = mock.Mock()
with mock.patch('docker.api.client.APIClient.inspect_container', with mock.patch('docker.api.client.APIClient.inspect_container',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment