diff options
author | Akihiro Suda <suda.akihiro@lab.ntt.co.jp> | 2016-09-28 01:50:12 +0000 |
---|---|---|
committer | Akihiro Suda <suda.akihiro@lab.ntt.co.jp> | 2016-09-30 01:21:05 +0000 |
commit | 7fb7a477d79c67ab53c432977780662ccbfeec57 (patch) | |
tree | 93a3dfe3ac7e06c31733926306b3a45a74931e1c /integration-cli/docker_api_build_test.go | |
parent | 1d669d82c1d5691f9706112acdbe4f70812cf6aa (diff) | |
download | docker-7fb7a477d79c67ab53c432977780662ccbfeec57.tar.gz |
[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>
Diffstat (limited to 'integration-cli/docker_api_build_test.go')
-rw-r--r-- | integration-cli/docker_api_build_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index b905d89bbb..9b069a43a6 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-check/check" ) -func (s *DockerSuite) TestBuildApiDockerFileRemote(c *check.C) { +func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) { testRequires(c, NotUserNamespace) var testD string if daemonPlatform == "windows" { @@ -44,7 +44,7 @@ RUN find /tmp/` c.Assert(out, checker.Not(checker.Contains), "baz") } -func (s *DockerSuite) TestBuildApiRemoteTarballContext(c *check.C) { +func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) { buffer := new(bytes.Buffer) tw := tar.NewWriter(buffer) defer tw.Close() @@ -77,7 +77,7 @@ func (s *DockerSuite) TestBuildApiRemoteTarballContext(c *check.C) { b.Close() } -func (s *DockerSuite) TestBuildApiRemoteTarballContextWithCustomDockerfile(c *check.C) { +func (s *DockerSuite) TestBuildAPIRemoteTarballContextWithCustomDockerfile(c *check.C) { buffer := new(bytes.Buffer) tw := tar.NewWriter(buffer) defer tw.Close() @@ -132,7 +132,7 @@ RUN echo 'right' c.Assert(string(content), checker.Not(checker.Contains), "wrong") } -func (s *DockerSuite) TestBuildApiLowerDockerfile(c *check.C) { +func (s *DockerSuite) TestBuildAPILowerDockerfile(c *check.C) { git, err := newFakeGit("repo", map[string]string{ "dockerfile": `FROM busybox RUN echo from dockerfile`, @@ -151,7 +151,7 @@ RUN echo from dockerfile`, c.Assert(out, checker.Contains, "from dockerfile") } -func (s *DockerSuite) TestBuildApiBuildGitWithF(c *check.C) { +func (s *DockerSuite) TestBuildAPIBuildGitWithF(c *check.C) { git, err := newFakeGit("repo", map[string]string{ "baz": `FROM busybox RUN echo from baz`, @@ -173,7 +173,7 @@ RUN echo from Dockerfile`, c.Assert(out, checker.Contains, "from baz") } -func (s *DockerSuite) TestBuildApiDoubleDockerfile(c *check.C) { +func (s *DockerSuite) TestBuildAPIDoubleDockerfile(c *check.C) { testRequires(c, UnixCli) // dockerfile overwrites Dockerfile on Windows git, err := newFakeGit("repo", map[string]string{ "Dockerfile": `FROM busybox @@ -196,7 +196,7 @@ RUN echo from dockerfile`, c.Assert(out, checker.Contains, "from Dockerfile") } -func (s *DockerSuite) TestBuildApiUnnormalizedTarPaths(c *check.C) { +func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) { // Make sure that build context tars with entries of the form // x/./y don't cause caching false positives. |