clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 05:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return nice client-side message for docker logs

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit e37e329074517f48db8468affc62beb595ab090e)
This commit is contained in:
Alexander Morozov
2015-11-09 18:36:29 -05:00
committed by Tibor Vass
parent be83aacf80
commit f3827116a3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_daemon_test.go
+3 -3
View File
@@ -1242,10 +1242,10 @@ func (s *DockerDaemonSuite) TestDaemonLoggingDriverNoneLogsError(c *check.C) {
}
id := strings.TrimSpace(out)
out, err = s.d.Cmd("logs", id)
if err != nil {
c.Fatalf("Logs request should be sent and then fail with \"none\" driver")
if err == nil {
c.Fatalf("Logs should fail with 'none' driver")
}
if !strings.Contains(out, `Error running logs job: Failed to get logging factory: logger: no log driver named 'none' is registered`) {
if !strings.Contains(out, `"logs" command is supported only for "json-file" and "journald" logging drivers (got: none)`) {
c.Fatalf("There should be an error about none not being a recognized log driver, got: %s", out)
}
}