2015-04-11 21:49:14 +00:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
2015-04-22 01:51:41 +00:00
|
|
|
"bufio"
|
2015-04-11 21:49:14 +00:00
|
|
|
"bytes"
|
|
|
|
"fmt"
|
|
|
|
"net/http"
|
2015-04-22 01:51:41 +00:00
|
|
|
"strings"
|
|
|
|
"time"
|
2015-04-18 16:46:47 +00:00
|
|
|
|
2015-10-15 17:33:31 +00:00
|
|
|
"github.com/docker/docker/pkg/integration/checker"
|
2015-04-18 16:46:47 +00:00
|
|
|
"github.com/go-check/check"
|
2015-04-11 21:49:14 +00:00
|
|
|
)
|
|
|
|
|
[nit] integration-cli: obey Go's naming convention
No substantial code change.
- Api --> API
- Cli --> CLI
- Http, Https --> HTTP, HTTPS
- Id --> ID
- Uid,Gid,Pid --> UID,PID,PID
- Ipam --> IPAM
- Tls --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)
Didn't touch in this commit:
- Git: because it is officially "Git": https://git-scm.com/
- Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
- Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-28 01:50:12 +00:00
|
|
|
func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
|
2015-04-22 01:51:41 +00:00
|
|
|
out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
|
|
|
|
id := strings.TrimSpace(out)
|
2015-10-15 17:33:31 +00:00
|
|
|
c.Assert(waitRun(id), checker.IsNil)
|
2015-04-11 21:49:14 +00:00
|
|
|
|
2015-04-22 01:51:41 +00:00
|
|
|
type logOut struct {
|
2015-04-27 16:33:08 +00:00
|
|
|
out string
|
|
|
|
res *http.Response
|
|
|
|
err error
|
2015-04-22 01:51:41 +00:00
|
|
|
}
|
|
|
|
chLog := make(chan logOut)
|
|
|
|
|
|
|
|
go func() {
|
2015-04-27 16:33:08 +00:00
|
|
|
res, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1×tamps=1", id), nil, "")
|
2015-07-23 11:24:14 +00:00
|
|
|
if err != nil {
|
|
|
|
chLog <- logOut{"", nil, err}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer body.Close()
|
|
|
|
out, err := bufio.NewReader(body).ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
chLog <- logOut{"", nil, err}
|
|
|
|
return
|
|
|
|
}
|
2015-04-27 16:33:08 +00:00
|
|
|
chLog <- logOut{strings.TrimSpace(out), res, err}
|
2015-04-22 01:51:41 +00:00
|
|
|
}()
|
|
|
|
|
|
|
|
select {
|
|
|
|
case l := <-chLog:
|
2015-10-15 17:33:31 +00:00
|
|
|
c.Assert(l.err, checker.IsNil)
|
|
|
|
c.Assert(l.res.StatusCode, checker.Equals, http.StatusOK)
|
2015-04-22 01:51:41 +00:00
|
|
|
if !strings.HasSuffix(l.out, "hello") {
|
|
|
|
c.Fatalf("expected log output to container 'hello', but it does not")
|
|
|
|
}
|
2016-03-02 18:26:15 +00:00
|
|
|
case <-time.After(20 * time.Second):
|
2015-04-22 01:51:41 +00:00
|
|
|
c.Fatal("timeout waiting for logs to exit")
|
2015-04-11 21:49:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[nit] integration-cli: obey Go's naming convention
No substantial code change.
- Api --> API
- Cli --> CLI
- Http, Https --> HTTP, HTTPS
- Id --> ID
- Uid,Gid,Pid --> UID,PID,PID
- Ipam --> IPAM
- Tls --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)
Didn't touch in this commit:
- Git: because it is officially "Git": https://git-scm.com/
- Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
- Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-28 01:50:12 +00:00
|
|
|
func (s *DockerSuite) TestLogsAPINoStdoutNorStderr(c *check.C) {
|
2015-04-11 21:49:14 +00:00
|
|
|
name := "logs_test"
|
2015-07-14 06:35:36 +00:00
|
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
|
2015-04-11 21:49:14 +00:00
|
|
|
|
2015-04-20 21:03:56 +00:00
|
|
|
status, body, err := sockRequest("GET", fmt.Sprintf("/containers/%s/logs", name), nil)
|
2015-10-15 17:33:31 +00:00
|
|
|
c.Assert(status, checker.Equals, http.StatusBadRequest)
|
|
|
|
c.Assert(err, checker.IsNil)
|
2015-04-11 21:49:14 +00:00
|
|
|
|
|
|
|
expected := "Bad parameters: you must choose at least one stream"
|
2016-05-21 11:56:04 +00:00
|
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
2015-04-11 21:49:14 +00:00
|
|
|
}
|
2015-04-23 22:08:41 +00:00
|
|
|
|
|
|
|
// Regression test for #12704
|
[nit] integration-cli: obey Go's naming convention
No substantial code change.
- Api --> API
- Cli --> CLI
- Http, Https --> HTTP, HTTPS
- Id --> ID
- Uid,Gid,Pid --> UID,PID,PID
- Ipam --> IPAM
- Tls --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)
Didn't touch in this commit:
- Git: because it is officially "Git": https://git-scm.com/
- Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
- Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-28 01:50:12 +00:00
|
|
|
func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
|
2015-04-23 22:08:41 +00:00
|
|
|
name := "logs_test"
|
|
|
|
t0 := time.Now()
|
2015-07-14 06:35:36 +00:00
|
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
|
2015-04-23 22:08:41 +00:00
|
|
|
|
|
|
|
_, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
|
|
|
|
t1 := time.Now()
|
2015-10-15 17:33:31 +00:00
|
|
|
c.Assert(err, checker.IsNil)
|
2015-04-23 22:08:41 +00:00
|
|
|
body.Close()
|
|
|
|
elapsed := t1.Sub(t0).Seconds()
|
2016-02-24 21:43:52 +00:00
|
|
|
if elapsed > 20.0 {
|
2015-04-23 22:08:41 +00:00
|
|
|
c.Fatalf("HTTP response was not immediate (elapsed %.1fs)", elapsed)
|
|
|
|
}
|
|
|
|
}
|
2015-09-28 20:36:29 +00:00
|
|
|
|
[nit] integration-cli: obey Go's naming convention
No substantial code change.
- Api --> API
- Cli --> CLI
- Http, Https --> HTTP, HTTPS
- Id --> ID
- Uid,Gid,Pid --> UID,PID,PID
- Ipam --> IPAM
- Tls --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)
Didn't touch in this commit:
- Git: because it is officially "Git": https://git-scm.com/
- Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
- Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-28 01:50:12 +00:00
|
|
|
func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
|
2015-09-28 20:36:29 +00:00
|
|
|
name := "nonExistentContainer"
|
|
|
|
resp, _, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
|
2015-10-15 17:33:31 +00:00
|
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
|
2015-09-28 20:36:29 +00:00
|
|
|
}
|