Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -13,7 +13,6 @@ import ( |
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
|
| 16 |
- testRequires(c, DaemonIsLinux) |
|
| 17 | 16 |
out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done") |
| 18 | 17 |
id := strings.TrimSpace(out) |
| 19 | 18 |
c.Assert(waitRun(id), checker.IsNil) |
| ... | ... |
@@ -53,7 +52,6 @@ func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
|
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 | 55 |
func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
|
| 56 |
- testRequires(c, DaemonIsLinux) |
|
| 57 | 56 |
name := "logs_test" |
| 58 | 57 |
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh") |
| 59 | 58 |
|
| ... | ... |
@@ -69,7 +67,6 @@ func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
|
| 69 | 69 |
|
| 70 | 70 |
// Regression test for #12704 |
| 71 | 71 |
func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
|
| 72 |
- testRequires(c, DaemonIsLinux) |
|
| 73 | 72 |
name := "logs_test" |
| 74 | 73 |
t0 := time.Now() |
| 75 | 74 |
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10") |
| ... | ... |
@@ -79,12 +76,12 @@ func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
|
| 79 | 79 |
c.Assert(err, checker.IsNil) |
| 80 | 80 |
body.Close() |
| 81 | 81 |
elapsed := t1.Sub(t0).Seconds() |
| 82 |
- if elapsed > 5.0 {
|
|
| 82 |
+ if elapsed > 20.0 {
|
|
| 83 | 83 |
c.Fatalf("HTTP response was not immediate (elapsed %.1fs)", elapsed)
|
| 84 | 84 |
} |
| 85 | 85 |
} |
| 86 | 86 |
|
| 87 |
-func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
|
|
| 87 |
+func (s *DockerSuite) TestLogsApiContainerNotFound(c *check.C) {
|
|
| 88 | 88 |
name := "nonExistentContainer" |
| 89 | 89 |
resp, _, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
|
| 90 | 90 |
c.Assert(err, checker.IsNil) |