InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nit] integration-cli: obey Go's naming convention

Browse Source 
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>
This commit is contained in:
Akihiro Suda
2016-09-28 01:50:12 +00:00
parent 1d669d82c1
commit 7fb7a477d7
31 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-cli/docker_api_logs_test.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/go-check/check"
)
func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
id := strings.TrimSpace(out)
c.Assert(waitRun(id), checker.IsNil)
@@ -51,7 +51,7 @@ func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
}
}
func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
func (s *DockerSuite) TestLogsAPINoStdoutNorStderr(c *check.C) {
name := "logs_test"
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
@@ -64,7 +64,7 @@ func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
}
// Regression test for #12704
func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
name := "logs_test"
t0 := time.Now()
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
@@ -79,7 +79,7 @@ func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
}
}
func (s *DockerSuite) TestLogsApiContainerNotFound(c *check.C) {
func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
name := "nonExistentContainer"
resp, _, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
c.Assert(err, checker.IsNil)