1. docker
  2. Commit 7fb7a477d79c67ab53c432977780662ccbfeec57
Browse code

[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>

Akihiro Suda authored on 2016/09/28 10:50:12
Showing 31 changed files
integration-cli/docker_api_auth_test.go
History View file @ 7fb7a47
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 )
10 10
11 11 
 // Test case for #22244
12 
-func (s *DockerSuite) TestAuthApi(c *check.C) {
12 
+func (s *DockerSuite) TestAuthAPI(c *check.C) {
13 13 
 	testRequires(c, Network)
14 14 
 	config := types.AuthConfig{
15 15 
 		Username: "no-user",
integration-cli/docker_api_build_test.go
History View file @ 7fb7a47
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"github.com/go-check/check"
12 12 
 )
13 13
14 
-func (s *DockerSuite) TestBuildApiDockerFileRemote(c *check.C) {
14 
+func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {
15 15 
 	testRequires(c, NotUserNamespace)
16 16 
 	var testD string
17 17 
 	if daemonPlatform == "windows" {
... ... 
@@ -44,7 +44,7 @@ RUN find /tmp/`
44 44 
 	c.Assert(out, checker.Not(checker.Contains), "baz")
45 45 
 }
46 46
47 
-func (s *DockerSuite) TestBuildApiRemoteTarballContext(c *check.C) {
47 
+func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) {
48 48 
 	buffer := new(bytes.Buffer)
49 49 
 	tw := tar.NewWriter(buffer)
50 50 
 	defer tw.Close()
... ... 
@@ -77,7 +77,7 @@ func (s *DockerSuite) TestBuildApiRemoteTarballContext(c *check.C) {
77 77 
 	b.Close()
78 78 
 }
79 79
80 
-func (s *DockerSuite) TestBuildApiRemoteTarballContextWithCustomDockerfile(c *check.C) {
80 
+func (s *DockerSuite) TestBuildAPIRemoteTarballContextWithCustomDockerfile(c *check.C) {
81 81 
 	buffer := new(bytes.Buffer)
82 82 
 	tw := tar.NewWriter(buffer)
83 83 
 	defer tw.Close()
... ... 
@@ -132,7 +132,7 @@ RUN echo 'right'
132 132 
 	c.Assert(string(content), checker.Not(checker.Contains), "wrong")
133 133 
 }
134 134
135 
-func (s *DockerSuite) TestBuildApiLowerDockerfile(c *check.C) {
135 
+func (s *DockerSuite) TestBuildAPILowerDockerfile(c *check.C) {
136 136 
 	git, err := newFakeGit("repo", map[string]string{
137 137 
 		"dockerfile": `FROM busybox
138 138 
 RUN echo from dockerfile`,
... ... 
@@ -151,7 +151,7 @@ RUN echo from dockerfile`,
151 151 
 	c.Assert(out, checker.Contains, "from dockerfile")
152 152 
 }
153 153
154 
-func (s *DockerSuite) TestBuildApiBuildGitWithF(c *check.C) {
154 
+func (s *DockerSuite) TestBuildAPIBuildGitWithF(c *check.C) {
155 155 
 	git, err := newFakeGit("repo", map[string]string{
156 156 
 		"baz": `FROM busybox
157 157 
 RUN echo from baz`,
... ... 
@@ -173,7 +173,7 @@ RUN echo from Dockerfile`,
173 173 
 	c.Assert(out, checker.Contains, "from baz")
174 174 
 }
175 175
176 
-func (s *DockerSuite) TestBuildApiDoubleDockerfile(c *check.C) {
176 
+func (s *DockerSuite) TestBuildAPIDoubleDockerfile(c *check.C) {
177 177 
 	testRequires(c, UnixCli) // dockerfile overwrites Dockerfile on Windows
178 178 
 	git, err := newFakeGit("repo", map[string]string{
179 179 
 		"Dockerfile": `FROM busybox
... ... 
@@ -196,7 +196,7 @@ RUN echo from dockerfile`,
196 196 
 	c.Assert(out, checker.Contains, "from Dockerfile")
197 197 
 }
198 198
199 
-func (s *DockerSuite) TestBuildApiUnnormalizedTarPaths(c *check.C) {
199 
+func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) {
200 200 
 	// Make sure that build context tars with entries of the form
201 201 
 	// x/./y don't cause caching false positives.
202 202
integration-cli/docker_api_containers_test.go
History View file @ 7fb7a47
... ... 
@@ -30,7 +30,7 @@ import (
30 30 
 	"github.com/go-check/check"
31 31 
 )
32 32
33 
-func (s *DockerSuite) TestContainerApiGetAll(c *check.C) {
33 
+func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {
34 34 
 	startCount, err := getContainerCount()
35 35 
 	c.Assert(err, checker.IsNil, check.Commentf("Cannot query container count"))
36 36
... ... 
@@ -54,7 +54,7 @@ func (s *DockerSuite) TestContainerApiGetAll(c *check.C) {
54 54 
 }
55 55
56 56 
 // regression test for empty json field being omitted #13691
57 
-func (s *DockerSuite) TestContainerApiGetJSONNoFieldsOmitted(c *check.C) {
57 
+func (s *DockerSuite) TestContainerAPIGetJSONNoFieldsOmitted(c *check.C) {
58 58 
 	dockerCmd(c, "run", "busybox", "true")
59 59
60 60 
 	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
... ... 
@@ -91,7 +91,7 @@ type containerPs struct {
91 91 
 }
92 92
93 93 
 // regression test for non-empty fields from #13901
94 
-func (s *DockerSuite) TestContainerApiPsOmitFields(c *check.C) {
94 
+func (s *DockerSuite) TestContainerAPIPsOmitFields(c *check.C) {
95 95 
 	// Problematic for Windows porting due to networking not yet being passed back
96 96 
 	testRequires(c, DaemonIsLinux)
97 97 
 	name := "pstest"
... ... 
@@ -124,7 +124,7 @@ func (s *DockerSuite) TestContainerApiPsOmitFields(c *check.C) {
124 124 
 	c.Assert(ok, checker.Not(checker.Equals), true)
125 125 
 }
126 126
127 
-func (s *DockerSuite) TestContainerApiGetExport(c *check.C) {
127 
+func (s *DockerSuite) TestContainerAPIGetExport(c *check.C) {
128 128 
 	// TODO: Investigate why this fails on Windows to Windows CI
129 129 
 	testRequires(c, DaemonIsLinux)
130 130 
 	name := "exportcontainer"
... ... 
@@ -148,7 +148,7 @@ func (s *DockerSuite) TestContainerApiGetExport(c *check.C) {
148 148 
 	c.Assert(found, checker.True, check.Commentf("The created test file has not been found in the exported image"))
149 149 
 }
150 150
151 
-func (s *DockerSuite) TestContainerApiGetChanges(c *check.C) {
151 
+func (s *DockerSuite) TestContainerAPIGetChanges(c *check.C) {
152 152 
 	// Not supported on Windows as Windows does not support docker diff (/containers/name/changes)
153 153 
 	testRequires(c, DaemonIsLinux)
154 154 
 	name := "changescontainer"
... ... 
@@ -343,7 +343,7 @@ func (s *DockerSuite) TestGetStoppedContainerStats(c *check.C) {
343 343 
 	}
344 344 
 }
345 345
346 
-func (s *DockerSuite) TestContainerApiPause(c *check.C) {
346 
+func (s *DockerSuite) TestContainerAPIPause(c *check.C) {
347 347 
 	// Problematic on Windows as Windows does not support pause
348 348 
 	testRequires(c, DaemonIsLinux)
349 349 
 	defer unpauseAllContainers()
... ... 
@@ -370,7 +370,7 @@ func (s *DockerSuite) TestContainerApiPause(c *check.C) {
370 370 
 	c.Assert(pausedContainers, checker.IsNil, check.Commentf("There should be no paused container."))
371 371 
 }
372 372
373 
-func (s *DockerSuite) TestContainerApiTop(c *check.C) {
373 
+func (s *DockerSuite) TestContainerAPITop(c *check.C) {
374 374 
 	// Problematic on Windows as Windows does not support top
375 375 
 	testRequires(c, DaemonIsLinux)
376 376 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "top")
... ... 
@@ -396,7 +396,7 @@ func (s *DockerSuite) TestContainerApiTop(c *check.C) {
396 396 
 	c.Assert(top.Processes[1][10], checker.Equals, "top")
397 397 
 }
398 398
399 
-func (s *DockerSuite) TestContainerApiCommit(c *check.C) {
399 
+func (s *DockerSuite) TestContainerAPICommit(c *check.C) {
400 400 
 	cName := "testapicommit"
401 401 
 	dockerCmd(c, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test")
402 402
... ... 
@@ -418,7 +418,7 @@ func (s *DockerSuite) TestContainerApiCommit(c *check.C) {
418 418 
 	dockerCmd(c, "run", img.ID, "ls", "/test")
419 419 
 }
420 420
421 
-func (s *DockerSuite) TestContainerApiCommitWithLabelInConfig(c *check.C) {
421 
+func (s *DockerSuite) TestContainerAPICommitWithLabelInConfig(c *check.C) {
422 422 
 	cName := "testapicommitwithconfig"
423 423 
 	dockerCmd(c, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test")
424 424
... ... 
@@ -450,7 +450,7 @@ func (s *DockerSuite) TestContainerApiCommitWithLabelInConfig(c *check.C) {
450 450 
 	dockerCmd(c, "run", img.ID, "ls", "/test")
451 451 
 }
452 452
453 
-func (s *DockerSuite) TestContainerApiBadPort(c *check.C) {
453 
+func (s *DockerSuite) TestContainerAPIBadPort(c *check.C) {
454 454 
 	// TODO Windows to Windows CI - Port this test
455 455 
 	testRequires(c, DaemonIsLinux)
456 456 
 	config := map[string]interface{}{
... ... 
@@ -475,7 +475,7 @@ func (s *DockerSuite) TestContainerApiBadPort(c *check.C) {
475 475 
 	c.Assert(getErrorMessage(c, body), checker.Equals, `invalid port specification: "aa80"`, check.Commentf("Incorrect error msg: %s", body))
476 476 
 }
477 477
478 
-func (s *DockerSuite) TestContainerApiCreate(c *check.C) {
478 
+func (s *DockerSuite) TestContainerAPICreate(c *check.C) {
479 479 
 	config := map[string]interface{}{
480 480 
 		"Image": "busybox",
481 481 
 		"Cmd":   []string{"/bin/sh", "-c", "touch /test && ls /test"},
... ... 
@@ -495,7 +495,7 @@ func (s *DockerSuite) TestContainerApiCreate(c *check.C) {
495 495 
 	c.Assert(strings.TrimSpace(out), checker.Equals, "/test")
496 496 
 }
497 497
498 
-func (s *DockerSuite) TestContainerApiCreateEmptyConfig(c *check.C) {
498 
+func (s *DockerSuite) TestContainerAPICreateEmptyConfig(c *check.C) {
499 499 
 	config := map[string]interface{}{}
500 500
501 501 
 	status, body, err := sockRequest("POST", "/containers/create", config)
... ... 
@@ -506,7 +506,7 @@ func (s *DockerSuite) TestContainerApiCreateEmptyConfig(c *check.C) {
506 506 
 	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
507 507 
 }
508 508
509 
-func (s *DockerSuite) TestContainerApiCreateMultipleNetworksConfig(c *check.C) {
509 
+func (s *DockerSuite) TestContainerAPICreateMultipleNetworksConfig(c *check.C) {
510 510 
 	// Container creation must fail if client specified configurations for more than one network
511 511 
 	config := map[string]interface{}{
512 512 
 		"Image": "busybox",
... ... 
@@ -530,7 +530,7 @@ func (s *DockerSuite) TestContainerApiCreateMultipleNetworksConfig(c *check.C) {
530 530 
 	c.Assert(msg, checker.Contains, "net3")
531 531 
 }
532 532
533 
-func (s *DockerSuite) TestContainerApiCreateWithHostName(c *check.C) {
533 
+func (s *DockerSuite) TestContainerAPICreateWithHostName(c *check.C) {
534 534 
 	hostName := "test-host"
535 535 
 	config := map[string]interface{}{
536 536 
 		"Image":    "busybox",
... ... 
@@ -553,7 +553,7 @@ func (s *DockerSuite) TestContainerApiCreateWithHostName(c *check.C) {
553 553 
 	c.Assert(containerJSON.Config.Hostname, checker.Equals, hostName, check.Commentf("Mismatched Hostname"))
554 554 
 }
555 555
556 
-func (s *DockerSuite) TestContainerApiCreateWithDomainName(c *check.C) {
556 
+func (s *DockerSuite) TestContainerAPICreateWithDomainName(c *check.C) {
557 557 
 	domainName := "test-domain"
558 558 
 	config := map[string]interface{}{
559 559 
 		"Image":      "busybox",
... ... 
@@ -576,13 +576,13 @@ func (s *DockerSuite) TestContainerApiCreateWithDomainName(c *check.C) {
576 576 
 	c.Assert(containerJSON.Config.Domainname, checker.Equals, domainName, check.Commentf("Mismatched Domainname"))
577 577 
 }
578 578
579 
-func (s *DockerSuite) TestContainerApiCreateBridgeNetworkMode(c *check.C) {
579 
+func (s *DockerSuite) TestContainerAPICreateBridgeNetworkMode(c *check.C) {
580 580 
 	// Windows does not support bridge
581 581 
 	testRequires(c, DaemonIsLinux)
582 582 
 	UtilCreateNetworkMode(c, "bridge")
583 583 
 }
584 584
585 
-func (s *DockerSuite) TestContainerApiCreateOtherNetworkModes(c *check.C) {
585 
+func (s *DockerSuite) TestContainerAPICreateOtherNetworkModes(c *check.C) {
586 586 
 	// Windows does not support these network modes
587 587 
 	testRequires(c, DaemonIsLinux, NotUserNamespace)
588 588 
 	UtilCreateNetworkMode(c, "host")
... ... 
@@ -611,7 +611,7 @@ func UtilCreateNetworkMode(c *check.C, networkMode string) {
611 611 
 	c.Assert(containerJSON.HostConfig.NetworkMode, checker.Equals, containertypes.NetworkMode(networkMode), check.Commentf("Mismatched NetworkMode"))
612 612 
 }
613 613
614 
-func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
614 
+func (s *DockerSuite) TestContainerAPICreateWithCpuSharesCpuset(c *check.C) {
615 615 
 	// TODO Windows to Windows CI. The CpuShares part could be ported.
616 616 
 	testRequires(c, DaemonIsLinux)
617 617 
 	config := map[string]interface{}{
... ... 
@@ -642,7 +642,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
642 642 
 	c.Assert(outCpuset, checker.Equals, "0")
643 643 
 }
644 644
645 
-func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {
645 
+func (s *DockerSuite) TestContainerAPIVerifyHeader(c *check.C) {
646 646 
 	config := map[string]interface{}{
647 647 
 		"Image": "busybox",
648 648 
 	}
... ... 
@@ -673,7 +673,7 @@ func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {
673 673 
 }
674 674
675 675 
 //Issue 14230. daemon should return 500 for invalid port syntax
676 
-func (s *DockerSuite) TestContainerApiInvalidPortSyntax(c *check.C) {
676 
+func (s *DockerSuite) TestContainerAPIInvalidPortSyntax(c *check.C) {
677 677 
 	config := `{
678 678 
 				  "Image": "busybox",
679 679 
 				  "HostConfig": {
... ... 
@@ -695,7 +695,7 @@ func (s *DockerSuite) TestContainerApiInvalidPortSyntax(c *check.C) {
695 695 
 	c.Assert(string(b[:]), checker.Contains, "invalid port")
696 696 
 }
697 697
698 
-func (s *DockerSuite) TestContainerApiInvalidRestartPolicyName(c *check.C) {
698 
+func (s *DockerSuite) TestContainerAPIInvalidRestartPolicyName(c *check.C) {
699 699 
 	config := `{
700 700 
 		"Image": "busybox",
701 701 
 		"HostConfig": {
... ... 
@@ -715,7 +715,7 @@ func (s *DockerSuite) TestContainerApiInvalidRestartPolicyName(c *check.C) {
715 715 
 	c.Assert(string(b[:]), checker.Contains, "invalid restart policy")
716 716 
 }
717 717
718 
-func (s *DockerSuite) TestContainerApiInvalidRestartPolicyRetryMismatch(c *check.C) {
718 
+func (s *DockerSuite) TestContainerAPIInvalidRestartPolicyRetryMismatch(c *check.C) {
719 719 
 	config := `{
720 720 
 		"Image": "busybox",
721 721 
 		"HostConfig": {
... ... 
@@ -735,7 +735,7 @@ func (s *DockerSuite) TestContainerApiInvalidRestartPolicyRetryMismatch(c *check
735 735 
 	c.Assert(string(b[:]), checker.Contains, "maximum restart count not valid with restart policy")
736 736 
 }
737 737
738 
-func (s *DockerSuite) TestContainerApiInvalidRestartPolicyPositiveRetryCount(c *check.C) {
738 
+func (s *DockerSuite) TestContainerAPIInvalidRestartPolicyPositiveRetryCount(c *check.C) {
739 739 
 	config := `{
740 740 
 		"Image": "busybox",
741 741 
 		"HostConfig": {
... ... 
@@ -757,7 +757,7 @@ func (s *DockerSuite) TestContainerApiInvalidRestartPolicyPositiveRetryCount(c *
757 757
758 758 
 // Issue 7941 - test to make sure a "null" in JSON is just ignored.
759 759 
 // W/o this fix a null in JSON would be parsed into a string var as "null"
760 
-func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) {
760 
+func (s *DockerSuite) TestContainerAPIPostCreateNull(c *check.C) {
761 761 
 	config := `{
762 762 
 		"Hostname":"",
763 763 
 		"Domainname":"",
... ... 
@@ -821,11 +821,11 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
821 821 
 	c.Assert(string(b), checker.Contains, "Minimum memory limit allowed is 4MB")
822 822 
 }
823 823
824 
-func (s *DockerSuite) TestContainerApiRename(c *check.C) {
825 
-	out, _ := dockerCmd(c, "run", "--name", "TestContainerApiRename", "-d", "busybox", "sh")
824 
+func (s *DockerSuite) TestContainerAPIRename(c *check.C) {
825 
+	out, _ := dockerCmd(c, "run", "--name", "TestContainerAPIRename", "-d", "busybox", "sh")
826 826
827 827 
 	containerID := strings.TrimSpace(out)
828 
-	newName := "TestContainerApiRenameNew"
828 
+	newName := "TestContainerAPIRenameNew"
829 829 
 	statusCode, _, err := sockRequest("POST", "/containers/"+containerID+"/rename?name="+newName, nil)
830 830 
 	c.Assert(err, checker.IsNil)
831 831 
 	// 204 No Content is expected, not 200
... ... 
@@ -835,7 +835,7 @@ func (s *DockerSuite) TestContainerApiRename(c *check.C) {
835 835 
 	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container"))
836 836 
 }
837 837
838 
-func (s *DockerSuite) TestContainerApiKill(c *check.C) {
838 
+func (s *DockerSuite) TestContainerAPIKill(c *check.C) {
839 839 
 	name := "test-api-kill"
840 840 
 	runSleepingContainer(c, "-i", "--name", name)
841 841
... ... 
@@ -847,7 +847,7 @@ func (s *DockerSuite) TestContainerApiKill(c *check.C) {
847 847 
 	c.Assert(state, checker.Equals, "false", check.Commentf("got wrong State from container %s: %q", name, state))
848 848 
 }
849 849
850 
-func (s *DockerSuite) TestContainerApiRestart(c *check.C) {
850 
+func (s *DockerSuite) TestContainerAPIRestart(c *check.C) {
851 851 
 	// TODO Windows to Windows CI. This is flaky due to the timing
852 852 
 	testRequires(c, DaemonIsLinux)
853 853 
 	name := "test-api-restart"
... ... 
@@ -859,7 +859,7 @@ func (s *DockerSuite) TestContainerApiRestart(c *check.C) {
859 859 
 	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 5*time.Second), checker.IsNil)
860 860 
 }
861 861
862 
-func (s *DockerSuite) TestContainerApiRestartNotimeoutParam(c *check.C) {
862 
+func (s *DockerSuite) TestContainerAPIRestartNotimeoutParam(c *check.C) {
863 863 
 	// TODO Windows to Windows CI. This is flaky due to the timing
864 864 
 	testRequires(c, DaemonIsLinux)
865 865 
 	name := "test-api-restart-no-timeout-param"
... ... 
@@ -873,7 +873,7 @@ func (s *DockerSuite) TestContainerApiRestartNotimeoutParam(c *check.C) {
873 873 
 	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 5*time.Second), checker.IsNil)
874 874 
 }
875 875
876 
-func (s *DockerSuite) TestContainerApiStart(c *check.C) {
876 
+func (s *DockerSuite) TestContainerAPIStart(c *check.C) {
877 877 
 	name := "testing-start"
878 878 
 	config := map[string]interface{}{
879 879 
 		"Image":     "busybox",
... ... 
@@ -899,7 +899,7 @@ func (s *DockerSuite) TestContainerApiStart(c *check.C) {
899 899 
 	}
900 900 
 }
901 901
902 
-func (s *DockerSuite) TestContainerApiStop(c *check.C) {
902 
+func (s *DockerSuite) TestContainerAPIStop(c *check.C) {
903 903 
 	name := "test-api-stop"
904 904 
 	runSleepingContainer(c, "-i", "--name", name)
905 905
... ... 
@@ -914,7 +914,7 @@ func (s *DockerSuite) TestContainerApiStop(c *check.C) {
914 914 
 	c.Assert(status, checker.Equals, http.StatusNotModified)
915 915 
 }
916 916
917 
-func (s *DockerSuite) TestContainerApiWait(c *check.C) {
917 
+func (s *DockerSuite) TestContainerAPIWait(c *check.C) {
918 918 
 	name := "test-api-wait"
919 919
920 920 
 	sleepCmd := "/bin/sleep"
... ... 
@@ -933,7 +933,7 @@ func (s *DockerSuite) TestContainerApiWait(c *check.C) {
933 933 
 	c.Assert(waitres.StatusCode, checker.Equals, 0)
934 934 
 }
935 935
936 
-func (s *DockerSuite) TestContainerApiCopyNotExistsAnyMore(c *check.C) {
936 
+func (s *DockerSuite) TestContainerAPICopyNotExistsAnyMore(c *check.C) {
937 937 
 	name := "test-container-api-copy"
938 938 
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
939 939
... ... 
@@ -946,7 +946,7 @@ func (s *DockerSuite) TestContainerApiCopyNotExistsAnyMore(c *check.C) {
946 946 
 	c.Assert(status, checker.Equals, http.StatusNotFound)
947 947 
 }
948 948
949 
-func (s *DockerSuite) TestContainerApiCopyPre124(c *check.C) {
949 
+func (s *DockerSuite) TestContainerAPICopyPre124(c *check.C) {
950 950
951 951 
 	name := "test-container-api-copy"
952 952 
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
... ... 
@@ -976,7 +976,7 @@ func (s *DockerSuite) TestContainerApiCopyPre124(c *check.C) {
976 976 
 	c.Assert(found, checker.True)
977 977 
 }
978 978
979 
-func (s *DockerSuite) TestContainerApiCopyResourcePathEmptyPr124(c *check.C) {
979 
+func (s *DockerSuite) TestContainerAPICopyResourcePathEmptyPr124(c *check.C) {
980 980 
 	name := "test-container-api-copy-resource-empty"
981 981 
 	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
982 982
... ... 
@@ -990,7 +990,7 @@ func (s *DockerSuite) TestContainerApiCopyResourcePathEmptyPr124(c *check.C) {
990 990 
 	c.Assert(string(body), checker.Matches, "Path cannot be empty\n")
991 991 
 }
992 992
993 
-func (s *DockerSuite) TestContainerApiCopyResourcePathNotFoundPre124(c *check.C) {
993 
+func (s *DockerSuite) TestContainerAPICopyResourcePathNotFoundPre124(c *check.C) {
994 994 
 	name := "test-container-api-copy-resource-not-found"
995 995 
 	dockerCmd(c, "run", "--name", name, "busybox")
996 996
... ... 
@@ -1004,7 +1004,7 @@ func (s *DockerSuite) TestContainerApiCopyResourcePathNotFoundPre124(c *check.C)
1004 1004 
 	c.Assert(string(body), checker.Matches, "Could not find the file /notexist in container "+name+"\n")
1005 1005 
 }
1006 1006
1007 
-func (s *DockerSuite) TestContainerApiCopyContainerNotFoundPr124(c *check.C) {
1007 
+func (s *DockerSuite) TestContainerAPICopyContainerNotFoundPr124(c *check.C) {
1008 1008 
 	postData := types.CopyConfig{
1009 1009 
 		Resource: "/something",
1010 1010 
 	}
... ... 
@@ -1014,7 +1014,7 @@ func (s *DockerSuite) TestContainerApiCopyContainerNotFoundPr124(c *check.C) {
1014 1014 
 	c.Assert(status, checker.Equals, http.StatusNotFound)
1015 1015 
 }
1016 1016
1017 
-func (s *DockerSuite) TestContainerApiDelete(c *check.C) {
1017 
+func (s *DockerSuite) TestContainerAPIDelete(c *check.C) {
1018 1018 
 	out, _ := runSleepingContainer(c)
1019 1019
1020 1020 
 	id := strings.TrimSpace(out)
... ... 
@@ -1027,14 +1027,14 @@ func (s *DockerSuite) TestContainerApiDelete(c *check.C) {
1027 1027 
 	c.Assert(status, checker.Equals, http.StatusNoContent)
1028 1028 
 }
1029 1029
1030 
-func (s *DockerSuite) TestContainerApiDeleteNotExist(c *check.C) {
1030 
+func (s *DockerSuite) TestContainerAPIDeleteNotExist(c *check.C) {
1031 1031 
 	status, body, err := sockRequest("DELETE", "/containers/doesnotexist", nil)
1032 1032 
 	c.Assert(err, checker.IsNil)
1033 1033 
 	c.Assert(status, checker.Equals, http.StatusNotFound)
1034 1034 
 	c.Assert(getErrorMessage(c, body), checker.Matches, "No such container: doesnotexist")
1035 1035 
 }
1036 1036
1037 
-func (s *DockerSuite) TestContainerApiDeleteForce(c *check.C) {
1037 
+func (s *DockerSuite) TestContainerAPIDeleteForce(c *check.C) {
1038 1038 
 	out, _ := runSleepingContainer(c)
1039 1039
1040 1040 
 	id := strings.TrimSpace(out)
... ... 
@@ -1045,7 +1045,7 @@ func (s *DockerSuite) TestContainerApiDeleteForce(c *check.C) {
1045 1045 
 	c.Assert(status, checker.Equals, http.StatusNoContent)
1046 1046 
 }
1047 1047
1048 
-func (s *DockerSuite) TestContainerApiDeleteRemoveLinks(c *check.C) {
1048 
+func (s *DockerSuite) TestContainerAPIDeleteRemoveLinks(c *check.C) {
1049 1049 
 	// Windows does not support links
1050 1050 
 	testRequires(c, DaemonIsLinux)
1051 1051 
 	out, _ := dockerCmd(c, "run", "-d", "--name", "tlink1", "busybox", "top")
... ... 
@@ -1069,7 +1069,7 @@ func (s *DockerSuite) TestContainerApiDeleteRemoveLinks(c *check.C) {
1069 1069 
 	c.Assert(linksPostRm, checker.Equals, "null", check.Commentf("call to api deleteContainer links should have removed the specified links"))
1070 1070 
 }
1071 1071
1072 
-func (s *DockerSuite) TestContainerApiDeleteConflict(c *check.C) {
1072 
+func (s *DockerSuite) TestContainerAPIDeleteConflict(c *check.C) {
1073 1073 
 	out, _ := runSleepingContainer(c)
1074 1074
1075 1075 
 	id := strings.TrimSpace(out)
... ... 
@@ -1080,7 +1080,7 @@ func (s *DockerSuite) TestContainerApiDeleteConflict(c *check.C) {
1080 1080 
 	c.Assert(status, checker.Equals, http.StatusConflict)
1081 1081 
 }
1082 1082
1083 
-func (s *DockerSuite) TestContainerApiDeleteRemoveVolume(c *check.C) {
1083 
+func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {
1084 1084 
 	testRequires(c, SameHostDaemon)
1085 1085
1086 1086 
 	vol := "/testvolume"
... ... 
@@ -1105,7 +1105,7 @@ func (s *DockerSuite) TestContainerApiDeleteRemoveVolume(c *check.C) {
1105 1105 
 }
1106 1106
1107 1107 
 // Regression test for https://github.com/docker/docker/issues/6231
1108 
-func (s *DockerSuite) TestContainerApiChunkedEncoding(c *check.C) {
1108 
+func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {
1109 1109 
 	conn, err := sockConn(time.Duration(10*time.Second), "")
1110 1110 
 	c.Assert(err, checker.IsNil)
1111 1111 
 	client := httputil.NewClientConn(conn, nil)
... ... 
@@ -1133,7 +1133,7 @@ func (s *DockerSuite) TestContainerApiChunkedEncoding(c *check.C) {
1133 1133 
 	c.Assert(resp.StatusCode, checker.Equals, http.StatusCreated)
1134 1134 
 }
1135 1135
1136 
-func (s *DockerSuite) TestContainerApiPostContainerStop(c *check.C) {
1136 
+func (s *DockerSuite) TestContainerAPIPostContainerStop(c *check.C) {
1137 1137 
 	out, _ := runSleepingContainer(c)
1138 1138
1139 1139 
 	containerID := strings.TrimSpace(out)
... ... 
@@ -1147,7 +1147,7 @@ func (s *DockerSuite) TestContainerApiPostContainerStop(c *check.C) {
1147 1147 
 }
1148 1148
1149 1149 
 // #14170
1150 
-func (s *DockerSuite) TestPostContainerApiCreateWithStringOrSliceEntrypoint(c *check.C) {
1150 
+func (s *DockerSuite) TestPostContainerAPICreateWithStringOrSliceEntrypoint(c *check.C) {
1151 1151 
 	config := struct {
1152 1152 
 		Image      string
1153 1153 
 		Entrypoint string
... ... 
@@ -1215,7 +1215,7 @@ func (s *DockerSuite) TestPostContainersCreateWithStringOrSliceCapAddDrop(c *che
1215 1215 
 }
1216 1216
1217 1217 
 // #14915
1218 
-func (s *DockerSuite) TestContainerApiCreateNoHostConfig118(c *check.C) {
1218 
+func (s *DockerSuite) TestContainerAPICreateNoHostConfig118(c *check.C) {
1219 1219 
 	config := struct {
1220 1220 
 		Image string
1221 1221 
 	}{"busybox"}
... ... 
@@ -1259,7 +1259,7 @@ func (s *DockerSuite) TestPutContainerArchiveErrSymlinkInVolumeToReadOnlyRootfs(
1259 1259 
 	}
1260 1260 
 }
1261 1261
1262 
-func (s *DockerSuite) TestContainerApiGetContainersJSONEmpty(c *check.C) {
1262 
+func (s *DockerSuite) TestContainerAPIGetContainersJSONEmpty(c *check.C) {
1263 1263 
 	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
1264 1264 
 	c.Assert(err, checker.IsNil)
1265 1265 
 	c.Assert(status, checker.Equals, http.StatusOK)
... ... 
@@ -1463,14 +1463,14 @@ func (s *DockerSuite) TestPostContainersCreateWithOomScoreAdjInvalidRange(c *che
1463 1463 
 }
1464 1464
1465 1465 
 // test case for #22210 where an empty container name caused panic.
1466 
-func (s *DockerSuite) TestContainerApiDeleteWithEmptyName(c *check.C) {
1466 
+func (s *DockerSuite) TestContainerAPIDeleteWithEmptyName(c *check.C) {
1467 1467 
 	status, out, err := sockRequest("DELETE", "/containers/", nil)
1468 1468 
 	c.Assert(err, checker.IsNil)
1469 1469 
 	c.Assert(status, checker.Equals, http.StatusBadRequest)
1470 1470 
 	c.Assert(string(out), checker.Contains, "No container name or ID supplied")
1471 1471 
 }
1472 1472
1473 
-func (s *DockerSuite) TestContainerApiStatsWithNetworkDisabled(c *check.C) {
1473 
+func (s *DockerSuite) TestContainerAPIStatsWithNetworkDisabled(c *check.C) {
1474 1474 
 	// Problematic on Windows as Windows does not support stats
1475 1475 
 	testRequires(c, DaemonIsLinux)
1476 1476
... ... 
@@ -1522,7 +1522,7 @@ func (s *DockerSuite) TestContainerApiStatsWithNetworkDisabled(c *check.C) {
1522 1522 
 	}
1523 1523 
 }
1524 1524
1525 
-func (s *DockerSuite) TestContainersApiCreateMountsValidation(c *check.C) {
1525 
+func (s *DockerSuite) TestContainersAPICreateMountsValidation(c *check.C) {
1526 1526 
 	type m mounttypes.Mount
1527 1527 
 	type hc struct{ Mounts []m }
1528 1528 
 	type cfg struct {
... ... 
@@ -1577,7 +1577,7 @@ func (s *DockerSuite) TestContainersApiCreateMountsValidation(c *check.C) {
1577 1577 
 	}
1578 1578 
 }
1579 1579
1580 
-func (s *DockerSuite) TestContainerApiCreateMountsBindRead(c *check.C) {
1580 
+func (s *DockerSuite) TestContainerAPICreateMountsBindRead(c *check.C) {
1581 1581 
 	testRequires(c, NotUserNamespace, SameHostDaemon)
1582 1582 
 	// also with data in the host side
1583 1583 
 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
... ... 
@@ -1602,7 +1602,7 @@ func (s *DockerSuite) TestContainerApiCreateMountsBindRead(c *check.C) {
1602 1602 
 }
1603 1603
1604 1604 
 // Test Mounts comes out as expected for the MountPoint
1605 
-func (s *DockerSuite) TestContainersApiCreateMountsCreate(c *check.C) {
1605 
+func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {
1606 1606 
 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
1607 1607 
 	destPath := prefix + slash + "foo"
1608 1608
integration-cli/docker_api_create_test.go
History View file @ 7fb7a47
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/go-check/check"
8 8 
 )
9 9
10 
-func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) {
10 
+func (s *DockerSuite) TestAPICreateWithNotExistImage(c *check.C) {
11 11 
 	name := "test"
12 12 
 	config := map[string]interface{}{
13 13 
 		"Image":   "test456:v1",
integration-cli/docker_api_events_test.go
History View file @ 7fb7a47
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/go-check/check"
15 15 
 )
16 16
17 
-func (s *DockerSuite) TestEventsApiEmptyOutput(c *check.C) {
17 
+func (s *DockerSuite) TestEventsAPIEmptyOutput(c *check.C) {
18 18 
 	type apiResp struct {
19 19 
 		resp *http.Response
20 20 
 		err  error
... ... 
@@ -35,7 +35,7 @@ func (s *DockerSuite) TestEventsApiEmptyOutput(c *check.C) {
35 35 
 	}
36 36 
 }
37 37
38 
-func (s *DockerSuite) TestEventsApiBackwardsCompatible(c *check.C) {
38 
+func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {
39 39 
 	since := daemonTime(c).Unix()
40 40 
 	ts := strconv.FormatInt(since, 10)
41 41
integration-cli/docker_api_exec_resize_test.go
History View file @ 7fb7a47
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/go-check/check"
14 14 
 )
15 15
16 
-func (s *DockerSuite) TestExecResizeApiHeightWidthNoInt(c *check.C) {
16 
+func (s *DockerSuite) TestExecResizeAPIHeightWidthNoInt(c *check.C) {
17 17 
 	testRequires(c, DaemonIsLinux)
18 18 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
19 19 
 	cleanedContainerID := strings.TrimSpace(out)
integration-cli/docker_api_exec_test.go
History View file @ 7fb7a47
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 )
16 16
17 17 
 // Regression test for #9414
18 
-func (s *DockerSuite) TestExecApiCreateNoCmd(c *check.C) {
18 
+func (s *DockerSuite) TestExecAPICreateNoCmd(c *check.C) {
19 19 
 	name := "exec_test"
20 20 
 	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
21 21
... ... 
@@ -27,7 +27,7 @@ func (s *DockerSuite) TestExecApiCreateNoCmd(c *check.C) {
27 27 
 	c.Assert(getErrorMessage(c, body), checker.Contains, "No exec command specified", comment)
28 28 
 }
29 29
30 
-func (s *DockerSuite) TestExecApiCreateNoValidContentType(c *check.C) {
30 
+func (s *DockerSuite) TestExecAPICreateNoValidContentType(c *check.C) {
31 31 
 	name := "exec_test"
32 32 
 	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
33 33
... ... 
@@ -47,7 +47,7 @@ func (s *DockerSuite) TestExecApiCreateNoValidContentType(c *check.C) {
47 47 
 	c.Assert(getErrorMessage(c, b), checker.Contains, "Content-Type specified", comment)
48 48 
 }
49 49
50 
-func (s *DockerSuite) TestExecApiCreateContainerPaused(c *check.C) {
50 
+func (s *DockerSuite) TestExecAPICreateContainerPaused(c *check.C) {
51 51 
 	// Not relevant on Windows as Windows containers cannot be paused
52 52 
 	testRequires(c, DaemonIsLinux)
53 53 
 	name := "exec_create_test"
... ... 
@@ -62,7 +62,7 @@ func (s *DockerSuite) TestExecApiCreateContainerPaused(c *check.C) {
62 62 
 	c.Assert(getErrorMessage(c, body), checker.Contains, "Container "+name+" is paused, unpause the container before exec", comment)
63 63 
 }
64 64
65 
-func (s *DockerSuite) TestExecApiStart(c *check.C) {
65 
+func (s *DockerSuite) TestExecAPIStart(c *check.C) {
66 66 
 	testRequires(c, DaemonIsLinux) // Uses pause/unpause but bits may be salvagable to Windows to Windows CI
67 67 
 	dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
68 68
... ... 
@@ -85,7 +85,7 @@ func (s *DockerSuite) TestExecApiStart(c *check.C) {
85 85 
 	startExec(c, id, http.StatusOK)
86 86 
 }
87 87
88 
-func (s *DockerSuite) TestExecApiStartBackwardsCompatible(c *check.C) {
88 
+func (s *DockerSuite) TestExecAPIStartBackwardsCompatible(c *check.C) {
89 89 
 	runSleepingContainer(c, "-d", "--name", "test")
90 90 
 	id := createExec(c, "test")
91 91
... ... 
@@ -99,7 +99,7 @@ func (s *DockerSuite) TestExecApiStartBackwardsCompatible(c *check.C) {
99 99 
 }
100 100
101 101 
 // #19362
102 
-func (s *DockerSuite) TestExecApiStartMultipleTimesError(c *check.C) {
102 
+func (s *DockerSuite) TestExecAPIStartMultipleTimesError(c *check.C) {
103 103 
 	runSleepingContainer(c, "-d", "--name", "test")
104 104 
 	execID := createExec(c, "test")
105 105 
 	startExec(c, execID, http.StatusOK)
... ... 
@@ -123,7 +123,7 @@ func (s *DockerSuite) TestExecApiStartMultipleTimesError(c *check.C) {
123 123 
 }
124 124
125 125 
 // #20638
126 
-func (s *DockerSuite) TestExecApiStartWithDetach(c *check.C) {
126 
+func (s *DockerSuite) TestExecAPIStartWithDetach(c *check.C) {
127 127 
 	name := "foo"
128 128 
 	runSleepingContainer(c, "-d", "-t", "--name", name)
129 129 
 	data := map[string]interface{}{
integration-cli/docker_api_images_test.go
History View file @ 7fb7a47
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"github.com/go-check/check"
12 12 
 )
13 13
14 
-func (s *DockerSuite) TestApiImagesFilter(c *check.C) {
14 
+func (s *DockerSuite) TestAPIImagesFilter(c *check.C) {
15 15 
 	name := "utest:tag1"
16 16 
 	name2 := "utest/docker:tag2"
17 17 
 	name3 := "utest:5000/docker:tag3"
... ... 
@@ -47,7 +47,7 @@ func (s *DockerSuite) TestApiImagesFilter(c *check.C) {
47 47 
 	c.Assert(images[0].RepoTags, checker.HasLen, 1)
48 48 
 }
49 49
50 
-func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) {
50 
+func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) {
51 51 
 	// TODO Windows to Windows CI: Investigate further why this test fails.
52 52 
 	testRequires(c, Network)
53 53 
 	testRequires(c, DaemonIsLinux)
... ... 
@@ -71,7 +71,7 @@ func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) {
71 71 
 	c.Assert(strings.TrimSpace(string(inspectOut)), checker.Equals, id, check.Commentf("load did not work properly"))
72 72 
 }
73 73
74 
-func (s *DockerSuite) TestApiImagesDelete(c *check.C) {
74 
+func (s *DockerSuite) TestAPIImagesDelete(c *check.C) {
75 75 
 	if daemonPlatform != "windows" {
76 76 
 		testRequires(c, Network)
77 77 
 	}
... ... 
@@ -95,7 +95,7 @@ func (s *DockerSuite) TestApiImagesDelete(c *check.C) {
95 95 
 	c.Assert(status, checker.Equals, http.StatusOK)
96 96 
 }
97 97
98 
-func (s *DockerSuite) TestApiImagesHistory(c *check.C) {
98 
+func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {
99 99 
 	if daemonPlatform != "windows" {
100 100 
 		testRequires(c, Network)
101 101 
 	}
... ... 
@@ -118,7 +118,7 @@ func (s *DockerSuite) TestApiImagesHistory(c *check.C) {
118 118 
 }
119 119
120 120 
 // #14846
121 
-func (s *DockerSuite) TestApiImagesSearchJSONContentType(c *check.C) {
121 
+func (s *DockerSuite) TestAPIImagesSearchJSONContentType(c *check.C) {
122 122 
 	testRequires(c, Network)
123 123
124 124 
 	res, b, err := sockRequestRaw("GET", "/images/search?term=test", nil, "application/json")
integration-cli/docker_api_info_test.go
History View file @ 7fb7a47
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/go-check/check"
8 8 
 )
9 9
10 
-func (s *DockerSuite) TestInfoApi(c *check.C) {
10 
+func (s *DockerSuite) TestInfoAPI(c *check.C) {
11 11 
 	endpoint := "/info"
12 12
13 13 
 	status, body, err := sockRequest("GET", endpoint, nil)
integration-cli/docker_api_inspect_test.go
History View file @ 7fb7a47
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
15 
-func (s *DockerSuite) TestInspectApiContainerResponse(c *check.C) {
15 
+func (s *DockerSuite) TestInspectAPIContainerResponse(c *check.C) {
16 16 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
17 17
18 18 
 	cleanedContainerID := strings.TrimSpace(out)
... ... 
@@ -56,7 +56,7 @@ func (s *DockerSuite) TestInspectApiContainerResponse(c *check.C) {
56 56 
 	}
57 57 
 }
58 58
59 
-func (s *DockerSuite) TestInspectApiContainerVolumeDriverLegacy(c *check.C) {
59 
+func (s *DockerSuite) TestInspectAPIContainerVolumeDriverLegacy(c *check.C) {
60 60 
 	// No legacy implications for Windows
61 61 
 	testRequires(c, DaemonIsLinux)
62 62 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
... ... 
@@ -75,11 +75,11 @@ func (s *DockerSuite) TestInspectApiContainerVolumeDriverLegacy(c *check.C) {
75 75 
 		c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
76 76 
 		cfg := config.(map[string]interface{})
77 77 
 		_, ok = cfg["VolumeDriver"]
78 
-		c.Assert(ok, checker.True, check.Commentf("Api version %s expected to include VolumeDriver in 'Config'", version))
78 
+		c.Assert(ok, checker.True, check.Commentf("API version %s expected to include VolumeDriver in 'Config'", version))
79 79 
 	}
80 80 
 }
81 81
82 
-func (s *DockerSuite) TestInspectApiContainerVolumeDriver(c *check.C) {
82 
+func (s *DockerSuite) TestInspectAPIContainerVolumeDriver(c *check.C) {
83 83 
 	out, _ := dockerCmd(c, "run", "-d", "--volume-driver", "local", "busybox", "true")
84 84
85 85 
 	cleanedContainerID := strings.TrimSpace(out)
... ... 
@@ -94,16 +94,16 @@ func (s *DockerSuite) TestInspectApiContainerVolumeDriver(c *check.C) {
94 94 
 	c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
95 95 
 	cfg := config.(map[string]interface{})
96 96 
 	_, ok = cfg["VolumeDriver"]
97 
-	c.Assert(ok, checker.False, check.Commentf("Api version 1.21 expected to not include VolumeDriver in 'Config'"))
97 
+	c.Assert(ok, checker.False, check.Commentf("API version 1.21 expected to not include VolumeDriver in 'Config'"))
98 98
99 99 
 	config, ok = inspectJSON["HostConfig"]
100 100 
 	c.Assert(ok, checker.True, check.Commentf("Unable to find 'HostConfig'"))
101 101 
 	cfg = config.(map[string]interface{})
102 102 
 	_, ok = cfg["VolumeDriver"]
103 
-	c.Assert(ok, checker.True, check.Commentf("Api version 1.21 expected to include VolumeDriver in 'HostConfig'"))
103 
+	c.Assert(ok, checker.True, check.Commentf("API version 1.21 expected to include VolumeDriver in 'HostConfig'"))
104 104 
 }
105 105
106 
-func (s *DockerSuite) TestInspectApiImageResponse(c *check.C) {
106 
+func (s *DockerSuite) TestInspectAPIImageResponse(c *check.C) {
107 107 
 	dockerCmd(c, "tag", "busybox:latest", "busybox:mytag")
108 108
109 109 
 	endpoint := "/images/busybox/json"
... ... 
@@ -122,7 +122,7 @@ func (s *DockerSuite) TestInspectApiImageResponse(c *check.C) {
122 122 
 }
123 123
124 124 
 // #17131, #17139, #17173
125 
-func (s *DockerSuite) TestInspectApiEmptyFieldsInConfigPre121(c *check.C) {
125 
+func (s *DockerSuite) TestInspectAPIEmptyFieldsInConfigPre121(c *check.C) {
126 126 
 	// Not relevant on Windows
127 127 
 	testRequires(c, DaemonIsLinux)
128 128 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
... ... 
@@ -141,12 +141,12 @@ func (s *DockerSuite) TestInspectApiEmptyFieldsInConfigPre121(c *check.C) {
141 141 
 		cfg := config.(map[string]interface{})
142 142 
 		for _, f := range []string{"MacAddress", "NetworkDisabled", "ExposedPorts"} {
143 143 
 			_, ok := cfg[f]
144 
-			c.Check(ok, checker.True, check.Commentf("Api version %s expected to include %s in 'Config'", version, f))
144 
+			c.Check(ok, checker.True, check.Commentf("API version %s expected to include %s in 'Config'", version, f))
145 145 
 		}
146 146 
 	}
147 147 
 }
148 148
149 
-func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) {
149 
+func (s *DockerSuite) TestInspectAPIBridgeNetworkSettings120(c *check.C) {
150 150 
 	// Not relevant on Windows, and besides it doesn't have any bridge network settings
151 151 
 	testRequires(c, DaemonIsLinux)
152 152 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
... ... 
@@ -163,7 +163,7 @@ func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) {
163 163 
 	c.Assert(settings.IPAddress, checker.Not(checker.HasLen), 0)
164 164 
 }
165 165
166 
-func (s *DockerSuite) TestInspectApiBridgeNetworkSettings121(c *check.C) {
166 
+func (s *DockerSuite) TestInspectAPIBridgeNetworkSettings121(c *check.C) {
167 167 
 	// Windows doesn't have any bridge network settings
168 168 
 	testRequires(c, DaemonIsLinux)
169 169 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
integration-cli/docker_api_inspect_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 )
13 13
14 14 
 // #16665
15 
-func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) {
15 
+func (s *DockerSuite) TestInspectAPICpusetInConfigPre120(c *check.C) {
16 16 
 	testRequires(c, DaemonIsLinux)
17 17 
 	testRequires(c, cgroupCpuset)
18 18
... ... 
@@ -31,5 +31,5 @@ func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) {
31 31 
 	c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
32 32 
 	cfg := config.(map[string]interface{})
33 33 
 	_, ok = cfg["Cpuset"]
34 
-	c.Assert(ok, checker.True, check.Commentf("Api version 1.19 expected to include Cpuset in 'Config'"))
34 
+	c.Assert(ok, checker.True, check.Commentf("API version 1.19 expected to include Cpuset in 'Config'"))
35 35 
 }
integration-cli/docker_api_logs_test.go
History View file @ 7fb7a47
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
15 
-func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
15 
+func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
16 16 
 	out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
17 17 
 	id := strings.TrimSpace(out)
18 18 
 	c.Assert(waitRun(id), checker.IsNil)
... ... 
@@ -51,7 +51,7 @@ func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) {
51 51 
 	}
52 52 
 }
53 53
54 
-func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
54 
+func (s *DockerSuite) TestLogsAPINoStdoutNorStderr(c *check.C) {
55 55 
 	name := "logs_test"
56 56 
 	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
57 57
... ... 
@@ -64,7 +64,7 @@ func (s *DockerSuite) TestLogsApiNoStdoutNorStderr(c *check.C) {
64 64 
 }
65 65
66 66 
 // Regression test for #12704
67 
-func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
67 
+func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
68 68 
 	name := "logs_test"
69 69 
 	t0 := time.Now()
70 70 
 	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
... ... 
@@ -79,7 +79,7 @@ func (s *DockerSuite) TestLogsApiFollowEmptyOutput(c *check.C) {
79 79 
 	}
80 80 
 }
81 81
82 
-func (s *DockerSuite) TestLogsApiContainerNotFound(c *check.C) {
82 
+func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
83 83 
 	name := "nonExistentContainer"
84 84 
 	resp, _, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
85 85 
 	c.Assert(err, checker.IsNil)
integration-cli/docker_api_network_test.go
History View file @ 7fb7a47
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/go-check/check"
16 16 
 )
17 17
18 
-func (s *DockerSuite) TestApiNetworkGetDefaults(c *check.C) {
18 
+func (s *DockerSuite) TestAPINetworkGetDefaults(c *check.C) {
19 19 
 	testRequires(c, DaemonIsLinux)
20 20 
 	// By default docker daemon creates 3 networks. check if they are present
21 21 
 	defaults := []string{"bridge", "host", "none"}
... ... 
@@ -24,7 +24,7 @@ func (s *DockerSuite) TestApiNetworkGetDefaults(c *check.C) {
24 24 
 	}
25 25 
 }
26 26
27 
-func (s *DockerSuite) TestApiNetworkCreateDelete(c *check.C) {
27 
+func (s *DockerSuite) TestAPINetworkCreateDelete(c *check.C) {
28 28 
 	testRequires(c, DaemonIsLinux)
29 29 
 	// Create a network
30 30 
 	name := "testnetwork"
... ... 
@@ -42,7 +42,7 @@ func (s *DockerSuite) TestApiNetworkCreateDelete(c *check.C) {
42 42 
 	c.Assert(isNetworkAvailable(c, name), checker.Equals, false)
43 43 
 }
44 44
45 
-func (s *DockerSuite) TestApiNetworkCreateCheckDuplicate(c *check.C) {
45 
+func (s *DockerSuite) TestAPINetworkCreateCheckDuplicate(c *check.C) {
46 46 
 	testRequires(c, DaemonIsLinux)
47 47 
 	name := "testcheckduplicate"
48 48 
 	configOnCheck := types.NetworkCreateRequest{
... ... 
@@ -69,13 +69,13 @@ func (s *DockerSuite) TestApiNetworkCreateCheckDuplicate(c *check.C) {
69 69 
 	createNetwork(c, configNotCheck, true)
70 70 
 }
71 71
72 
-func (s *DockerSuite) TestApiNetworkFilter(c *check.C) {
72 
+func (s *DockerSuite) TestAPINetworkFilter(c *check.C) {
73 73 
 	testRequires(c, DaemonIsLinux)
74 74 
 	nr := getNetworkResource(c, getNetworkIDByName(c, "bridge"))
75 75 
 	c.Assert(nr.Name, checker.Equals, "bridge")
76 76 
 }
77 77
78 
-func (s *DockerSuite) TestApiNetworkInspect(c *check.C) {
78 
+func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {
79 79 
 	testRequires(c, DaemonIsLinux)
80 80 
 	// Inspect default bridge network
81 81 
 	nr := getNetworkResource(c, "bridge")
... ... 
@@ -129,7 +129,7 @@ func (s *DockerSuite) TestApiNetworkInspect(c *check.C) {
129 129 
 	c.Assert(isNetworkAvailable(c, "br0"), checker.Equals, false)
130 130 
 }
131 131
132 
-func (s *DockerSuite) TestApiNetworkConnectDisconnect(c *check.C) {
132 
+func (s *DockerSuite) TestAPINetworkConnectDisconnect(c *check.C) {
133 133 
 	testRequires(c, DaemonIsLinux)
134 134 
 	// Create test network
135 135 
 	name := "testnetwork"
... ... 
@@ -170,7 +170,7 @@ func (s *DockerSuite) TestApiNetworkConnectDisconnect(c *check.C) {
170 170 
 	deleteNetwork(c, nr.ID, true)
171 171 
 }
172 172
173 
-func (s *DockerSuite) TestApiNetworkIpamMultipleBridgeNetworks(c *check.C) {
173 
+func (s *DockerSuite) TestAPINetworkIPAMMultipleBridgeNetworks(c *check.C) {
174 174 
 	testRequires(c, DaemonIsLinux)
175 175 
 	// test0 bridge network
176 176 
 	ipam0 := &network.IPAM{
... ... 
@@ -235,7 +235,7 @@ func (s *DockerSuite) TestApiNetworkIpamMultipleBridgeNetworks(c *check.C) {
235 235 
 	}
236 236 
 }
237 237
238 
-func (s *DockerSuite) TestApiCreateDeletePredefinedNetworks(c *check.C) {
238 
+func (s *DockerSuite) TestAPICreateDeletePredefinedNetworks(c *check.C) {
239 239 
 	testRequires(c, DaemonIsLinux)
240 240 
 	createDeletePredefinedNetwork(c, "bridge")
241 241 
 	createDeletePredefinedNetwork(c, "none")
integration-cli/docker_api_resize_test.go
History View file @ 7fb7a47
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"github.com/go-check/check"
9 9 
 )
10 10
11 
-func (s *DockerSuite) TestResizeApiResponse(c *check.C) {
11 
+func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {
12 12 
 	out, _ := runSleepingContainer(c, "-d")
13 13 
 	cleanedContainerID := strings.TrimSpace(out)
14 14
... ... 
@@ -18,7 +18,7 @@ func (s *DockerSuite) TestResizeApiResponse(c *check.C) {
18 18 
 	c.Assert(err, check.IsNil)
19 19 
 }
20 20
21 
-func (s *DockerSuite) TestResizeApiHeightWidthNoInt(c *check.C) {
21 
+func (s *DockerSuite) TestResizeAPIHeightWidthNoInt(c *check.C) {
22 22 
 	out, _ := runSleepingContainer(c, "-d")
23 23 
 	cleanedContainerID := strings.TrimSpace(out)
24 24
... ... 
@@ -28,7 +28,7 @@ func (s *DockerSuite) TestResizeApiHeightWidthNoInt(c *check.C) {
28 28 
 	c.Assert(err, check.IsNil)
29 29 
 }
30 30
31 
-func (s *DockerSuite) TestResizeApiResponseWhenContainerNotStarted(c *check.C) {
31 
+func (s *DockerSuite) TestResizeAPIResponseWhenContainerNotStarted(c *check.C) {
32 32 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
33 33 
 	cleanedContainerID := strings.TrimSpace(out)
34 34
integration-cli/docker_api_service_update_test.go
History View file @ 7fb7a47
... ... 
@@ -17,7 +17,7 @@ func setPortConfig(portConfig []swarm.PortConfig) serviceConstructor {
17 17 
 	}
18 18 
 }
19 19
20 
-func (s *DockerSwarmSuite) TestApiServiceUpdatePort(c *check.C) {
20 
+func (s *DockerSwarmSuite) TestAPIServiceUpdatePort(c *check.C) {
21 21 
 	d := s.AddDaemon(c, true, true)
22 22
23 23 
 	// Create a service with a port mapping of 8080:8081.
integration-cli/docker_api_stats_test.go
History View file @ 7fb7a47
... ... 
@@ -19,7 +19,7 @@ import (
19 19
20 20 
 var expectedNetworkInterfaceStats = strings.Split("rx_bytes rx_dropped rx_errors rx_packets tx_bytes tx_dropped tx_errors tx_packets", " ")
21 21
22 
-func (s *DockerSuite) TestApiStatsNoStreamGetCpu(c *check.C) {
22 
+func (s *DockerSuite) TestAPIStatsNoStreamGetCpu(c *check.C) {
23 23 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "while true;do echo 'Hello'; usleep 100000; done")
24 24
25 25 
 	id := strings.TrimSpace(out)
... ... 
@@ -59,7 +59,7 @@ func (s *DockerSuite) TestApiStatsNoStreamGetCpu(c *check.C) {
59 59 
 	c.Assert(cpuPercent, check.Not(checker.Equals), 0.0, check.Commentf("docker stats with no-stream get cpu usage failed: was %v", cpuPercent))
60 60 
 }
61 61
62 
-func (s *DockerSuite) TestApiStatsStoppedContainerInGoroutines(c *check.C) {
62 
+func (s *DockerSuite) TestAPIStatsStoppedContainerInGoroutines(c *check.C) {
63 63 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo 1")
64 64 
 	id := strings.TrimSpace(out)
65 65
... ... 
@@ -94,7 +94,7 @@ func (s *DockerSuite) TestApiStatsStoppedContainerInGoroutines(c *check.C) {
94 94 
 	}
95 95 
 }
96 96
97 
-func (s *DockerSuite) TestApiStatsNetworkStats(c *check.C) {
97 
+func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {
98 98 
 	testRequires(c, SameHostDaemon)
99 99
100 100 
 	out, _ := runSleepingContainer(c)
... ... 
@@ -161,7 +161,7 @@ func (s *DockerSuite) TestApiStatsNetworkStats(c *check.C) {
161 161 
 		check.Commentf("Reported less Txbytes than expected. Expected >= %d. Found %d. %s", expRxPkts, postRxPackets, pingouts))
162 162 
 }
163 163
164 
-func (s *DockerSuite) TestApiStatsNetworkStatsVersioning(c *check.C) {
164 
+func (s *DockerSuite) TestAPIStatsNetworkStatsVersioning(c *check.C) {
165 165 
 	testRequires(c, SameHostDaemon)
166 166
167 167 
 	out, _ := runSleepingContainer(c)
... ... 
@@ -257,7 +257,7 @@ func jsonBlobHasGTE121NetworkStats(blob map[string]interface{}) bool {
257 257 
 	return true
258 258 
 }
259 259
260 
-func (s *DockerSuite) TestApiStatsContainerNotFound(c *check.C) {
260 
+func (s *DockerSuite) TestAPIStatsContainerNotFound(c *check.C) {
261 261 
 	testRequires(c, DaemonIsLinux)
262 262
263 263 
 	status, _, err := sockRequest("GET", "/containers/nonexistent/stats", nil)
... ... 
@@ -269,7 +269,7 @@ func (s *DockerSuite) TestApiStatsContainerNotFound(c *check.C) {
269 269 
 	c.Assert(status, checker.Equals, http.StatusNotFound)
270 270 
 }
271 271
272 
-func (s *DockerSuite) TestApiStatsNoStreamConnectedContainers(c *check.C) {
272 
+func (s *DockerSuite) TestAPIStatsNoStreamConnectedContainers(c *check.C) {
273 273 
 	testRequires(c, DaemonIsLinux)
274 274
275 275 
 	out1, _ := runSleepingContainer(c)
integration-cli/docker_api_stats_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
15 
-func (s *DockerSuite) TestApiStatsContainerGetMemoryLimit(c *check.C) {
15 
+func (s *DockerSuite) TestAPIStatsContainerGetMemoryLimit(c *check.C) {
16 16 
 	testRequires(c, DaemonIsLinux, memoryLimitSupport)
17 17
18 18 
 	resp, body, err := sockRequestRaw("GET", "/info", nil, "application/json")
integration-cli/docker_api_swarm_test.go
History View file @ 7fb7a47
... ... 
@@ -20,7 +20,7 @@ import (
20 20
21 21 
 var defaultReconciliationTimeout = 30 * time.Second
22 22
23 
-func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
23 
+func (s *DockerSwarmSuite) TestAPISwarmInit(c *check.C) {
24 24 
 	// todo: should find a better way to verify that components are running than /info
25 25 
 	d1 := s.AddDaemon(c, true, true)
26 26 
 	info, err := d1.info()
... ... 
@@ -71,7 +71,7 @@ func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
71 71 
 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
72 72 
 }
73 73
74 
-func (s *DockerSwarmSuite) TestApiSwarmJoinToken(c *check.C) {
74 
+func (s *DockerSwarmSuite) TestAPISwarmJoinToken(c *check.C) {
75 75 
 	d1 := s.AddDaemon(c, false, false)
76 76 
 	c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
77 77
... ... 
@@ -142,7 +142,7 @@ func (s *DockerSwarmSuite) TestApiSwarmJoinToken(c *check.C) {
142 142 
 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
143 143 
 }
144 144
145 
-func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
145 
+func (s *DockerSwarmSuite) TestAPISwarmCAHash(c *check.C) {
146 146 
 	d1 := s.AddDaemon(c, true, true)
147 147 
 	d2 := s.AddDaemon(c, false, false)
148 148 
 	splitToken := strings.Split(d1.joinTokens(c).Worker, "-")
... ... 
@@ -153,7 +153,7 @@ func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
153 153 
 	c.Assert(err.Error(), checker.Contains, "remote CA does not match fingerprint")
154 154 
 }
155 155
156 
-func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
156 
+func (s *DockerSwarmSuite) TestAPISwarmPromoteDemote(c *check.C) {
157 157 
 	d1 := s.AddDaemon(c, false, false)
158 158 
 	c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
159 159 
 	d2 := s.AddDaemon(c, true, false)
... ... 
@@ -196,7 +196,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
196 196 
 	waitAndAssert(c, defaultReconciliationTimeout, d2.checkControlAvailable, checker.True)
197 197 
 }
198 198
199 
-func (s *DockerSwarmSuite) TestApiSwarmServicesEmptyList(c *check.C) {
199 
+func (s *DockerSwarmSuite) TestAPISwarmServicesEmptyList(c *check.C) {
200 200 
 	d := s.AddDaemon(c, true, true)
201 201
202 202 
 	services := d.listServices(c)
... ... 
@@ -204,7 +204,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesEmptyList(c *check.C) {
204 204 
 	c.Assert(len(services), checker.Equals, 0, check.Commentf("services: %#v", services))
205 205 
 }
206 206
207 
-func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
207 
+func (s *DockerSwarmSuite) TestAPISwarmServicesCreate(c *check.C) {
208 208 
 	d := s.AddDaemon(c, true, true)
209 209
210 210 
 	instances := 2
... ... 
@@ -220,7 +220,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
220 220 
 	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 0)
221 221 
 }
222 222
223 
-func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
223 
+func (s *DockerSwarmSuite) TestAPISwarmServicesMultipleAgents(c *check.C) {
224 224 
 	d1 := s.AddDaemon(c, true, true)
225 225 
 	d2 := s.AddDaemon(c, true, false)
226 226 
 	d3 := s.AddDaemon(c, true, false)
... ... 
@@ -248,7 +248,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
248 248
249 249 
 }
250 250
251 
-func (s *DockerSwarmSuite) TestApiSwarmServicesCreateGlobal(c *check.C) {
251 
+func (s *DockerSwarmSuite) TestAPISwarmServicesCreateGlobal(c *check.C) {
252 252 
 	d1 := s.AddDaemon(c, true, true)
253 253 
 	d2 := s.AddDaemon(c, true, false)
254 254 
 	d3 := s.AddDaemon(c, true, false)
... ... 
@@ -266,7 +266,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesCreateGlobal(c *check.C) {
266 266 
 	waitAndAssert(c, defaultReconciliationTimeout, d5.checkActiveContainerCount, checker.Equals, 1)
267 267 
 }
268 268
269 
-func (s *DockerSwarmSuite) TestApiSwarmServicesUpdate(c *check.C) {
269 
+func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *check.C) {
270 270 
 	const nodeCount = 3
271 271 
 	var daemons [nodeCount]*SwarmDaemon
272 272 
 	for i := 0; i < nodeCount; i++ {
... ... 
@@ -312,7 +312,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesUpdate(c *check.C) {
312 312 
 		map[string]int{image2: instances})
313 313 
 }
314 314
315 
-func (s *DockerSwarmSuite) TestApiSwarmServiceConstraintRole(c *check.C) {
315 
+func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintRole(c *check.C) {
316 316 
 	const nodeCount = 3
317 317 
 	var daemons [nodeCount]*SwarmDaemon
318 318 
 	for i := 0; i < nodeCount; i++ {
... ... 
@@ -364,7 +364,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServiceConstraintRole(c *check.C) {
364 364 
 	}
365 365 
 }
366 366
367 
-func (s *DockerSwarmSuite) TestApiSwarmServiceConstraintLabel(c *check.C) {
367 
+func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintLabel(c *check.C) {
368 368 
 	const nodeCount = 3
369 369 
 	var daemons [nodeCount]*SwarmDaemon
370 370 
 	for i := 0; i < nodeCount; i++ {
... ... 
@@ -459,7 +459,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServiceConstraintLabel(c *check.C) {
459 459 
 	}
460 460 
 }
461 461
462 
-func (s *DockerSwarmSuite) TestApiSwarmServicesStateReporting(c *check.C) {
462 
+func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *check.C) {
463 463 
 	testRequires(c, SameHostDaemon)
464 464 
 	testRequires(c, DaemonIsLinux)
465 465
... ... 
@@ -533,7 +533,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesStateReporting(c *check.C) {
533 533 
 	}
534 534 
 }
535 535
536 
-func (s *DockerSwarmSuite) TestApiSwarmLeaderProxy(c *check.C) {
536 
+func (s *DockerSwarmSuite) TestAPISwarmLeaderProxy(c *check.C) {
537 537 
 	// add three managers, one of these is leader
538 538 
 	d1 := s.AddDaemon(c, true, true)
539 539 
 	d2 := s.AddDaemon(c, true, true)
... ... 
@@ -558,7 +558,7 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaderProxy(c *check.C) {
558 558 
 	}
559 559 
 }
560 560
561 
-func (s *DockerSwarmSuite) TestApiSwarmLeaderElection(c *check.C) {
561 
+func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) {
562 562 
 	// Create 3 nodes
563 563 
 	d1 := s.AddDaemon(c, true, true)
564 564 
 	d2 := s.AddDaemon(c, true, true)
... ... 
@@ -621,7 +621,7 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaderElection(c *check.C) {
621 621 
 	c.Assert(leader.NodeID, checker.Equals, stableleader.NodeID)
622 622 
 }
623 623
624 
-func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
624 
+func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {
625 625 
 	d1 := s.AddDaemon(c, true, true)
626 626 
 	d2 := s.AddDaemon(c, true, true)
627 627 
 	d3 := s.AddDaemon(c, true, true)
... ... 
@@ -659,7 +659,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
659 659 
 	})
660 660 
 }
661 661
662 
-func (s *DockerSwarmSuite) TestApiSwarmListNodes(c *check.C) {
662 
+func (s *DockerSwarmSuite) TestAPISwarmListNodes(c *check.C) {
663 663 
 	d1 := s.AddDaemon(c, true, true)
664 664 
 	d2 := s.AddDaemon(c, true, false)
665 665 
 	d3 := s.AddDaemon(c, true, false)
... ... 
@@ -678,7 +678,7 @@ loop0:
678 678 
 	}
679 679 
 }
680 680
681 
-func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
681 
+func (s *DockerSwarmSuite) TestAPISwarmNodeUpdate(c *check.C) {
682 682 
 	d := s.AddDaemon(c, true, true)
683 683
684 684 
 	nodes := d.listNodes(c)
... ... 
@@ -691,7 +691,7 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
691 691 
 	c.Assert(n.Spec.Availability, checker.Equals, swarm.NodeAvailabilityPause)
692 692 
 }
693 693
694 
-func (s *DockerSwarmSuite) TestApiSwarmNodeRemove(c *check.C) {
694 
+func (s *DockerSwarmSuite) TestAPISwarmNodeRemove(c *check.C) {
695 695 
 	testRequires(c, Network)
696 696 
 	d1 := s.AddDaemon(c, true, true)
697 697 
 	d2 := s.AddDaemon(c, true, false)
... ... 
@@ -722,7 +722,7 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeRemove(c *check.C) {
722 722 
 	c.Assert(len(nodes), checker.Equals, 2, check.Commentf("nodes: %#v", nodes))
723 723 
 }
724 724
725 
-func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
725 
+func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {
726 726 
 	d1 := s.AddDaemon(c, true, true)
727 727 
 	d2 := s.AddDaemon(c, true, false)
728 728
... ... 
@@ -776,7 +776,7 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
776 776
777 777 
 }
778 778
779 
-func (s *DockerSwarmSuite) TestApiSwarmLeaveRemovesContainer(c *check.C) {
779 
+func (s *DockerSwarmSuite) TestAPISwarmLeaveRemovesContainer(c *check.C) {
780 780 
 	d := s.AddDaemon(c, true, true)
781 781
782 782 
 	instances := 2
... ... 
@@ -799,7 +799,7 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveRemovesContainer(c *check.C) {
799 799 
 }
800 800
801 801 
 // #23629
802 
-func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {
802 
+func (s *DockerSwarmSuite) TestAPISwarmLeaveOnPendingJoin(c *check.C) {
803 803 
 	s.AddDaemon(c, true, true)
804 804 
 	d2 := s.AddDaemon(c, false, false)
805 805
... ... 
@@ -827,7 +827,7 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {
827 827 
 }
828 828
829 829 
 // #23705
830 
-func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
830 
+func (s *DockerSwarmSuite) TestAPISwarmRestoreOnPendingJoin(c *check.C) {
831 831 
 	d := s.AddDaemon(c, false, false)
832 832 
 	err := d.Join(swarm.JoinRequest{
833 833 
 		RemoteAddrs: []string{"123.123.123.123:1234"},
... ... 
@@ -845,7 +845,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
845 845 
 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
846 846 
 }
847 847
848 
-func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
848 
+func (s *DockerSwarmSuite) TestAPISwarmManagerRestore(c *check.C) {
849 849 
 	d1 := s.AddDaemon(c, true, true)
850 850
851 851 
 	instances := 2
... ... 
@@ -874,7 +874,7 @@ func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
874 874 
 	d3.getService(c, id)
875 875 
 }
876 876
877 
-func (s *DockerSwarmSuite) TestApiSwarmScaleNoRollingUpdate(c *check.C) {
877 
+func (s *DockerSwarmSuite) TestAPISwarmScaleNoRollingUpdate(c *check.C) {
878 878 
 	d := s.AddDaemon(c, true, true)
879 879
880 880 
 	instances := 2
... ... 
@@ -898,7 +898,7 @@ loop0:
898 898 
 	}
899 899 
 }
900 900
901 
-func (s *DockerSwarmSuite) TestApiSwarmInvalidAddress(c *check.C) {
901 
+func (s *DockerSwarmSuite) TestAPISwarmInvalidAddress(c *check.C) {
902 902 
 	d := s.AddDaemon(c, false, false)
903 903 
 	req := swarm.InitRequest{
904 904 
 		ListenAddr: "",
... ... 
@@ -916,7 +916,7 @@ func (s *DockerSwarmSuite) TestApiSwarmInvalidAddress(c *check.C) {
916 916 
 	c.Assert(status, checker.Equals, http.StatusInternalServerError)
917 917 
 }
918 918
919 
-func (s *DockerSwarmSuite) TestApiSwarmForceNewCluster(c *check.C) {
919 
+func (s *DockerSwarmSuite) TestAPISwarmForceNewCluster(c *check.C) {
920 920 
 	d1 := s.AddDaemon(c, true, true)
921 921 
 	d2 := s.AddDaemon(c, true, true)
922 922
... ... 
@@ -1099,7 +1099,7 @@ func checkClusterHealth(c *check.C, cl []*SwarmDaemon, managerCount, workerCount
1099 1099 
 	c.Assert(totalWCount, checker.Equals, workerCount)
1100 1100 
 }
1101 1101
1102 
-func (s *DockerSwarmSuite) TestApiSwarmRestartCluster(c *check.C) {
1102 
+func (s *DockerSwarmSuite) TestAPISwarmRestartCluster(c *check.C) {
1103 1103 
 	mCount, wCount := 5, 1
1104 1104
1105 1105 
 	var nodes []*SwarmDaemon
... ... 
@@ -1169,7 +1169,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRestartCluster(c *check.C) {
1169 1169 
 	checkClusterHealth(c, nodes, mCount, wCount)
1170 1170 
 }
1171 1171
1172 
-func (s *DockerSwarmSuite) TestApiSwarmServicesUpdateWithName(c *check.C) {
1172 
+func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateWithName(c *check.C) {
1173 1173 
 	d := s.AddDaemon(c, true, true)
1174 1174
1175 1175 
 	instances := 2
integration-cli/docker_api_test.go
History View file @ 7fb7a47
... ... 
@@ -15,13 +15,13 @@ import (
15 15 
 	"github.com/go-check/check"
16 16 
 )
17 17
18 
-func (s *DockerSuite) TestApiOptionsRoute(c *check.C) {
18 
+func (s *DockerSuite) TestAPIOptionsRoute(c *check.C) {
19 19 
 	status, _, err := sockRequest("OPTIONS", "/", nil)
20 20 
 	c.Assert(err, checker.IsNil)
21 21 
 	c.Assert(status, checker.Equals, http.StatusOK)
22 22 
 }
23 23
24 
-func (s *DockerSuite) TestApiGetEnabledCors(c *check.C) {
24 
+func (s *DockerSuite) TestAPIGetEnabledCORS(c *check.C) {
25 25 
 	res, body, err := sockRequestRaw("GET", "/version", nil, "")
26 26 
 	c.Assert(err, checker.IsNil)
27 27 
 	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
... ... 
@@ -33,7 +33,7 @@ func (s *DockerSuite) TestApiGetEnabledCors(c *check.C) {
33 33 
 	//c.Assert(res.Header.Get("Access-Control-Allow-Headers"), check.Equals, "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")
34 34 
 }
35 35
36 
-func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) {
36 
+func (s *DockerSuite) TestAPIVersionStatusCode(c *check.C) {
37 37 
 	conn, err := sockConn(time.Duration(10*time.Second), "")
38 38 
 	c.Assert(err, checker.IsNil)
39 39
... ... 
@@ -48,7 +48,7 @@ func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) {
48 48 
 	c.Assert(res.StatusCode, checker.Equals, http.StatusBadRequest)
49 49 
 }
50 50
51 
-func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) {
51 
+func (s *DockerSuite) TestAPIClientVersionNewerThanServer(c *check.C) {
52 52 
 	v := strings.Split(api.DefaultVersion, ".")
53 53 
 	vMinInt, err := strconv.Atoi(v[1])
54 54 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -63,7 +63,7 @@ func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) {
63 63 
 	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
64 64 
 }
65 65
66 
-func (s *DockerSuite) TestApiClientVersionOldNotSupported(c *check.C) {
66 
+func (s *DockerSuite) TestAPIClientVersionOldNotSupported(c *check.C) {
67 67 
 	v := strings.Split(api.MinVersion, ".")
68 68 
 	vMinInt, err := strconv.Atoi(v[1])
69 69 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -78,7 +78,7 @@ func (s *DockerSuite) TestApiClientVersionOldNotSupported(c *check.C) {
78 78 
 	c.Assert(strings.TrimSpace(string(body)), checker.Equals, expected)
79 79 
 }
80 80
81 
-func (s *DockerSuite) TestApiDockerApiVersion(c *check.C) {
81 
+func (s *DockerSuite) TestAPIDockerAPIVersion(c *check.C) {
82 82 
 	var svrVersion string
83 83
84 84 
 	server := httptest.NewServer(http.HandlerFunc(
... ... 
@@ -97,7 +97,7 @@ func (s *DockerSuite) TestApiDockerApiVersion(c *check.C) {
97 97 
 	c.Assert(svrVersion, check.Equals, "/vxxx/version", check.Commentf("%s", result.Compare(icmd.Success)))
98 98 
 }
99 99
100 
-func (s *DockerSuite) TestApiErrorJSON(c *check.C) {
100 
+func (s *DockerSuite) TestAPIErrorJSON(c *check.C) {
101 101 
 	httpResp, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(`{}`), "application/json")
102 102 
 	c.Assert(err, checker.IsNil)
103 103 
 	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError)
... ... 
@@ -107,7 +107,7 @@ func (s *DockerSuite) TestApiErrorJSON(c *check.C) {
107 107 
 	c.Assert(getErrorMessage(c, b), checker.Equals, "Config cannot be empty in order to create a container")
108 108 
 }
109 109
110 
-func (s *DockerSuite) TestApiErrorPlainText(c *check.C) {
110 
+func (s *DockerSuite) TestAPIErrorPlainText(c *check.C) {
111 111 
 	httpResp, body, err := sockRequestRaw("POST", "/v1.23/containers/create", strings.NewReader(`{}`), "application/json")
112 112 
 	c.Assert(err, checker.IsNil)
113 113 
 	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError)
... ... 
@@ -117,7 +117,7 @@ func (s *DockerSuite) TestApiErrorPlainText(c *check.C) {
117 117 
 	c.Assert(strings.TrimSpace(string(b)), checker.Equals, "Config cannot be empty in order to create a container")
118 118 
 }
119 119
120 
-func (s *DockerSuite) TestApiErrorNotFoundJSON(c *check.C) {
120 
+func (s *DockerSuite) TestAPIErrorNotFoundJSON(c *check.C) {
121 121 
 	// 404 is a different code path to normal errors, so test separately
122 122 
 	httpResp, body, err := sockRequestRaw("GET", "/notfound", nil, "application/json")
123 123 
 	c.Assert(err, checker.IsNil)
... ... 
@@ -128,7 +128,7 @@ func (s *DockerSuite) TestApiErrorNotFoundJSON(c *check.C) {
128 128 
 	c.Assert(getErrorMessage(c, b), checker.Equals, "page not found")
129 129 
 }
130 130
131 
-func (s *DockerSuite) TestApiErrorNotFoundPlainText(c *check.C) {
131 
+func (s *DockerSuite) TestAPIErrorNotFoundPlainText(c *check.C) {
132 132 
 	httpResp, body, err := sockRequestRaw("GET", "/v1.23/notfound", nil, "application/json")
133 133 
 	c.Assert(err, checker.IsNil)
134 134 
 	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusNotFound)
integration-cli/docker_api_update_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/go-check/check"
10 10 
 )
11 11
12 
-func (s *DockerSuite) TestApiUpdateContainer(c *check.C) {
12 
+func (s *DockerSuite) TestAPIUpdateContainer(c *check.C) {
13 13 
 	testRequires(c, DaemonIsLinux)
14 14 
 	testRequires(c, memoryLimitSupport)
15 15 
 	testRequires(c, swapMemorySupport)
integration-cli/docker_api_volumes_test.go
History View file @ 7fb7a47
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"github.com/go-check/check"
11 11 
 )
12 12
13 
-func (s *DockerSuite) TestVolumesApiList(c *check.C) {
13 
+func (s *DockerSuite) TestVolumesAPIList(c *check.C) {
14 14 
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
15 15 
 	dockerCmd(c, "run", "-v", prefix+"/foo", "busybox")
16 16
... ... 
@@ -24,7 +24,7 @@ func (s *DockerSuite) TestVolumesApiList(c *check.C) {
24 24 
 	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))
25 25 
 }
26 26
27 
-func (s *DockerSuite) TestVolumesApiCreate(c *check.C) {
27 
+func (s *DockerSuite) TestVolumesAPICreate(c *check.C) {
28 28 
 	config := types.VolumeCreateRequest{
29 29 
 		Name: "test",
30 30 
 	}
... ... 
@@ -39,7 +39,7 @@ func (s *DockerSuite) TestVolumesApiCreate(c *check.C) {
39 39 
 	c.Assert(filepath.Base(filepath.Dir(vol.Mountpoint)), checker.Equals, config.Name)
40 40 
 }
41 41
42 
-func (s *DockerSuite) TestVolumesApiRemove(c *check.C) {
42 
+func (s *DockerSuite) TestVolumesAPIRemove(c *check.C) {
43 43 
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
44 44 
 	dockerCmd(c, "run", "-v", prefix+"/foo", "--name=test", "busybox")
45 45
... ... 
@@ -63,7 +63,7 @@ func (s *DockerSuite) TestVolumesApiRemove(c *check.C) {
63 63
64 64 
 }
65 65
66 
-func (s *DockerSuite) TestVolumesApiInspect(c *check.C) {
66 
+func (s *DockerSuite) TestVolumesAPIInspect(c *check.C) {
67 67 
 	config := types.VolumeCreateRequest{
68 68 
 		Name: "test",
69 69 
 	}
integration-cli/docker_cli_authz_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -276,8 +276,8 @@ func (s *DockerAuthzSuite) TestAuthZPluginDenyRequest(c *check.C) {
276 276 
 	c.Assert(res, check.Equals, fmt.Sprintf("Error response from daemon: authorization denied by plugin %s: %s\n", testAuthZPlugin, unauthorizedMessage))
277 277 
 }
278 278
279 
-// TestAuthZPluginApiDenyResponse validates that when authorization plugin deny the request, the status code is forbidden
280 
-func (s *DockerAuthzSuite) TestAuthZPluginApiDenyResponse(c *check.C) {
279 
+// TestAuthZPluginAPIDenyResponse validates that when authorization plugin deny the request, the status code is forbidden
280 
+func (s *DockerAuthzSuite) TestAuthZPluginAPIDenyResponse(c *check.C) {
281 281 
 	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
282 282 
 	c.Assert(err, check.IsNil)
283 283 
 	s.ctrl.reqRes.Allow = false
integration-cli/docker_cli_build_test.go
History View file @ 7fb7a47
... ... 
@@ -4001,7 +4001,7 @@ func (s *DockerSuite) TestBuildAddTarXzGz(c *check.C) {
4001 4001
4002 4002 
 }
4003 4003
4004 
-func (s *DockerSuite) TestBuildFromGIT(c *check.C) {
4004 
+func (s *DockerSuite) TestBuildFromGit(c *check.C) {
4005 4005 
 	name := "testbuildfromgit"
4006 4006 
 	git, err := newFakeGit("repo", map[string]string{
4007 4007 
 		"Dockerfile": `FROM busybox
... ... 
@@ -4025,7 +4025,7 @@ func (s *DockerSuite) TestBuildFromGIT(c *check.C) {
4025 4025 
 	}
4026 4026 
 }
4027 4027
4028 
-func (s *DockerSuite) TestBuildFromGITWithContext(c *check.C) {
4028 
+func (s *DockerSuite) TestBuildFromGitWithContext(c *check.C) {
4029 4029 
 	name := "testbuildfromgit"
4030 4030 
 	git, err := newFakeGit("repo", map[string]string{
4031 4031 
 		"docker/Dockerfile": `FROM busybox
... ... 
@@ -4050,7 +4050,7 @@ func (s *DockerSuite) TestBuildFromGITWithContext(c *check.C) {
4050 4050 
 	}
4051 4051 
 }
4052 4052
4053 
-func (s *DockerSuite) TestBuildFromGITwithF(c *check.C) {
4053 
+func (s *DockerSuite) TestBuildFromGitwithF(c *check.C) {
4054 4054 
 	name := "testbuildfromgitwithf"
4055 4055 
 	git, err := newFakeGit("repo", map[string]string{
4056 4056 
 		"myApp/myDockerfile": `FROM busybox
integration-cli/docker_cli_config_test.go
History View file @ 7fb7a47
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/go-check/check"
16 16 
 )
17 17
18 
-func (s *DockerSuite) TestConfigHttpHeader(c *check.C) {
18 
+func (s *DockerSuite) TestConfigHTTPHeader(c *check.C) {
19 19 
 	testRequires(c, UnixCli) // Can't set/unset HOME on windows right now
20 20 
 	// We either need a level of Go that supports Unsetenv (for cases
21 21 
 	// when HOME/USERPROFILE isn't set), or we need to be able to use
integration-cli/docker_cli_daemon_test.go
History View file @ 7fb7a47
... ... 
@@ -1409,8 +1409,8 @@ func (s *DockerDaemonSuite) TestDaemonRestartKillWait(c *check.C) {
1409 1409 
 	}
1410 1410 
 }
1411 1411
1412 
-// TestHttpsInfo connects via two-way authenticated HTTPS to the info endpoint
1413 
-func (s *DockerDaemonSuite) TestHttpsInfo(c *check.C) {
1412 
+// TestHTTPSInfo connects via two-way authenticated HTTPS to the info endpoint
1413 
+func (s *DockerDaemonSuite) TestHTTPSInfo(c *check.C) {
1414 1414 
 	const (
1415 1415 
 		testDaemonHTTPSAddr = "tcp://localhost:4271"
1416 1416 
 	)
... ... 
@@ -1433,9 +1433,9 @@ func (s *DockerDaemonSuite) TestHttpsInfo(c *check.C) {
1433 1433 
 	}
1434 1434 
 }
1435 1435
1436 
-// TestHttpsRun connects via two-way authenticated HTTPS to the create, attach, start, and wait endpoints.
1436 
+// TestHTTPSRun connects via two-way authenticated HTTPS to the create, attach, start, and wait endpoints.
1437 1437 
 // https://github.com/docker/docker/issues/19280
1438 
-func (s *DockerDaemonSuite) TestHttpsRun(c *check.C) {
1438 
+func (s *DockerDaemonSuite) TestHTTPSRun(c *check.C) {
1439 1439 
 	const (
1440 1440 
 		testDaemonHTTPSAddr = "tcp://localhost:4271"
1441 1441 
 	)
... ... 
@@ -1462,17 +1462,17 @@ func (s *DockerDaemonSuite) TestHttpsRun(c *check.C) {
1462 1462 
 	}
1463 1463 
 }
1464 1464
1465 
-// TestTlsVerify verifies that --tlsverify=false turns on tls
1466 
-func (s *DockerDaemonSuite) TestTlsVerify(c *check.C) {
1465 
+// TestTLSVerify verifies that --tlsverify=false turns on tls
1466 
+func (s *DockerDaemonSuite) TestTLSVerify(c *check.C) {
1467 1467 
 	out, err := exec.Command(dockerdBinary, "--tlsverify=false").CombinedOutput()
1468 1468 
 	if err == nil || !strings.Contains(string(out), "Could not load X509 key pair") {
1469 1469 
 		c.Fatalf("Daemon should not have started due to missing certs: %v\n%s", err, string(out))
1470 1470 
 	}
1471 1471 
 }
1472 1472
1473 
-// TestHttpsInfoRogueCert connects via two-way authenticated HTTPS to the info endpoint
1473 
+// TestHTTPSInfoRogueCert connects via two-way authenticated HTTPS to the info endpoint
1474 1474 
 // by using a rogue client certificate and checks that it fails with the expected error.
1475 
-func (s *DockerDaemonSuite) TestHttpsInfoRogueCert(c *check.C) {
1475 
+func (s *DockerDaemonSuite) TestHTTPSInfoRogueCert(c *check.C) {
1476 1476 
 	const (
1477 1477 
 		errBadCertificate   = "bad certificate"
1478 1478 
 		testDaemonHTTPSAddr = "tcp://localhost:4271"
... ... 
@@ -1496,9 +1496,9 @@ func (s *DockerDaemonSuite) TestHttpsInfoRogueCert(c *check.C) {
1496 1496 
 	}
1497 1497 
 }
1498 1498
1499 
-// TestHttpsInfoRogueServerCert connects via two-way authenticated HTTPS to the info endpoint
1499 
+// TestHTTPSInfoRogueServerCert connects via two-way authenticated HTTPS to the info endpoint
1500 1500 
 // which provides a rogue server certificate and checks that it fails with the expected error
1501 
-func (s *DockerDaemonSuite) TestHttpsInfoRogueServerCert(c *check.C) {
1501 
+func (s *DockerDaemonSuite) TestHTTPSInfoRogueServerCert(c *check.C) {
1502 1502 
 	const (
1503 1503 
 		errCaUnknown             = "x509: certificate signed by unknown authority"
1504 1504 
 		testDaemonRogueHTTPSAddr = "tcp://localhost:4272"
... ... 
@@ -1696,7 +1696,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartCleanupNetns(c *check.C) {
1696 1696 
 }
1697 1697
1698 1698 
 // tests regression detailed in #13964 where DOCKER_TLS_VERIFY env is ignored
1699 
-func (s *DockerDaemonSuite) TestDaemonNoTlsCliTlsVerifyWithEnv(c *check.C) {
1699 
+func (s *DockerDaemonSuite) TestDaemonTLSVerifyIssue13964(c *check.C) {
1700 1700 
 	host := "tcp://localhost:4271"
1701 1701 
 	c.Assert(s.d.Start("-H", host), check.IsNil)
1702 1702 
 	cmd := exec.Command(dockerBinary, "-H", host, "info")
... ... 
@@ -1846,7 +1846,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutHost(c *check.C) {
1846 1846 
 	c.Assert(s.d.Start(), check.IsNil)
1847 1847 
 }
1848 1848
1849 
-func (s *DockerDaemonSuite) TestDaemonStartWithDefalutTlsHost(c *check.C) {
1849 
+func (s *DockerDaemonSuite) TestDaemonStartWithDefalutTLSHost(c *check.C) {
1850 1850 
 	s.d.useDefaultTLSHost = true
1851 1851 
 	defer func() {
1852 1852 
 		s.d.useDefaultTLSHost = false
integration-cli/docker_cli_network_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -30,7 +30,7 @@ import (
30 30 
 )
31 31
32 32 
 const dummyNetworkDriver = "dummy-network-driver"
33 
-const dummyIpamDriver = "dummy-ipam-driver"
33 
+const dummyIPAMDriver = "dummy-ipam-driver"
34 34
35 35 
 var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest
36 36
... ... 
@@ -59,7 +59,7 @@ func (s *DockerNetworkSuite) SetUpSuite(c *check.C) {
59 59 
 	mux := http.NewServeMux()
60 60 
 	s.server = httptest.NewServer(mux)
61 61 
 	c.Assert(s.server, check.NotNil, check.Commentf("Failed to start an HTTP Server"))
62 
-	setupRemoteNetworkDrivers(c, mux, s.server.URL, dummyNetworkDriver, dummyIpamDriver)
62 
+	setupRemoteNetworkDrivers(c, mux, s.server.URL, dummyNetworkDriver, dummyIPAMDriver)
63 63 
 }
64 64
65 65 
 func setupRemoteNetworkDrivers(c *check.C, mux *http.ServeMux, url, netDrv, ipamDrv string) {
... ... 
@@ -120,7 +120,7 @@ func setupRemoteNetworkDrivers(c *check.C, mux *http.ServeMux, url, netDrv, ipam
120 120 
 		fmt.Fprintf(w, "null")
121 121 
 	})
122 122
123 
-	// Ipam Driver implementation
123 
+	// IPAM Driver implementation
124 124 
 	var (
125 125 
 		poolRequest       remoteipam.RequestPoolRequest
126 126 
 		poolReleaseReq    remoteipam.ReleasePoolRequest
... ... 
@@ -601,7 +601,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {
601 601 
 	assertNwNotAvailable(c, "test")
602 602 
 }
603 603
604 
-func (s *DockerNetworkSuite) TestDockerNetworkIpamMultipleNetworks(c *check.C) {
604 
+func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {
605 605 
 	// test0 bridge network
606 606 
 	dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1")
607 607 
 	assertNwIsAvailable(c, "test1")
... ... 
@@ -641,24 +641,24 @@ func (s *DockerNetworkSuite) TestDockerNetworkIpamMultipleNetworks(c *check.C) {
641 641 
 	}
642 642 
 }
643 643
644 
-func (s *DockerNetworkSuite) TestDockerNetworkCustomIpam(c *check.C) {
644 
+func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {
645 645 
 	// Create a bridge network using custom ipam driver
646 
-	dockerCmd(c, "network", "create", "--ipam-driver", dummyIpamDriver, "br0")
646 
+	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0")
647 647 
 	assertNwIsAvailable(c, "br0")
648 648
649 649 
 	// Verify expected network ipam fields are there
650 650 
 	nr := getNetworkResource(c, "br0")
651 651 
 	c.Assert(nr.Driver, checker.Equals, "bridge")
652 
-	c.Assert(nr.IPAM.Driver, checker.Equals, dummyIpamDriver)
652 
+	c.Assert(nr.IPAM.Driver, checker.Equals, dummyIPAMDriver)
653 653
654 654 
 	// remove network and exercise remote ipam driver
655 655 
 	dockerCmd(c, "network", "rm", "br0")
656 656 
 	assertNwNotAvailable(c, "br0")
657 657 
 }
658 658
659 
-func (s *DockerNetworkSuite) TestDockerNetworkIpamOptions(c *check.C) {
659 
+func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {
660 660 
 	// Create a bridge network using custom ipam driver and options
661 
-	dockerCmd(c, "network", "create", "--ipam-driver", dummyIpamDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")
661 
+	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")
662 662 
 	assertNwIsAvailable(c, "br0")
663 663
664 664 
 	// Verify expected network ipam options
... ... 
@@ -734,7 +734,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomSpecified(c *check.C)
734 734 
 	assertNwNotAvailable(c, "test01")
735 735 
 }
736 736
737 
-func (s *DockerNetworkSuite) TestDockerNetworkIpamInvalidCombinations(c *check.C) {
737 
+func (s *DockerNetworkSuite) TestDockerNetworkIPAMInvalidCombinations(c *check.C) {
738 738 
 	// network with ip-range out of subnet range
739 739 
 	_, _, err := dockerCmdWithError("network", "create", "--subnet=192.168.0.0/16", "--ip-range=192.170.0.0/16", "test")
740 740 
 	c.Assert(err, check.NotNil)
... ... 
@@ -1014,7 +1014,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMacInspect(c *check.C) {
1014 1014 
 	c.Assert(mac, checker.Equals, "a0:b1:c2:d3:e4:f5")
1015 1015 
 }
1016 1016
1017 
-func (s *DockerSuite) TestInspectApiMultipleNetworks(c *check.C) {
1017 
+func (s *DockerSuite) TestInspectAPIMultipleNetworks(c *check.C) {
1018 1018 
 	dockerCmd(c, "network", "create", "mybridge1")
1019 1019 
 	dockerCmd(c, "network", "create", "mybridge2")
1020 1020 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
integration-cli/docker_cli_proxy_test.go
History View file @ 7fb7a47
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/go-check/check"
10 10 
 )
11 11
12 
-func (s *DockerSuite) TestCliProxyDisableProxyUnixSock(c *check.C) {
12 
+func (s *DockerSuite) TestCLIProxyDisableProxyUnixSock(c *check.C) {
13 13 
 	testRequires(c, DaemonIsLinux)
14 14 
 	testRequires(c, SameHostDaemon) // test is valid when DOCKER_HOST=unix://..
15 15
... ... 
@@ -23,7 +23,7 @@ func (s *DockerSuite) TestCliProxyDisableProxyUnixSock(c *check.C) {
23 23
24 24 
 // Can't use localhost here since go has a special case to not use proxy if connecting to localhost
25 25 
 // See https://golang.org/pkg/net/http/#ProxyFromEnvironment
26 
-func (s *DockerDaemonSuite) TestCliProxyProxyTCPSock(c *check.C) {
26 
+func (s *DockerDaemonSuite) TestCLIProxyProxyTCPSock(c *check.C) {
27 27 
 	testRequires(c, SameHostDaemon)
28 28 
 	// get the IP to use to connect since we can't use localhost
29 29 
 	addrs, err := net.InterfaceAddrs()
integration-cli/docker_cli_run_test.go
History View file @ 7fb7a47
... ... 
@@ -184,7 +184,7 @@ func (s *DockerSuite) TestRunLinksContainerWithContainerName(c *check.C) {
184 184 
 }
185 185
186 186 
 //test --link use container id to link target
187 
-func (s *DockerSuite) TestRunLinksContainerWithContainerId(c *check.C) {
187 
+func (s *DockerSuite) TestRunLinksContainerWithContainerID(c *check.C) {
188 188 
 	// TODO Windows: This test cannot run on a Windows daemon as the networking
189 189 
 	// settings are not populated back yet on inspect.
190 190 
 	testRequires(c, DaemonIsLinux)
... ... 
@@ -1709,7 +1709,7 @@ func (s *DockerSuite) TestRunState(c *check.C) {
1709 1709 
 }
1710 1710
1711 1711 
 // Test for #1737
1712 
-func (s *DockerSuite) TestRunCopyVolumeUidGid(c *check.C) {
1712 
+func (s *DockerSuite) TestRunCopyVolumeUIDGID(c *check.C) {
1713 1713 
 	// Not applicable on Windows as it does not support uid or gid in this way
1714 1714 
 	testRequires(c, DaemonIsLinux)
1715 1715 
 	name := "testrunvolumesuidgid"
... ... 
@@ -2484,7 +2484,7 @@ func (s *DockerSuite) TestRunModeIpcContainerNotRunning(c *check.C) {
2484 2484 
 	}
2485 2485 
 }
2486 2486
2487 
-func (s *DockerSuite) TestRunModePidContainer(c *check.C) {
2487 
+func (s *DockerSuite) TestRunModePIDContainer(c *check.C) {
2488 2488 
 	// Not applicable on Windows as uses Unix-specific capabilities
2489 2489 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
2490 2490
... ... 
@@ -2509,7 +2509,7 @@ func (s *DockerSuite) TestRunModePidContainer(c *check.C) {
2509 2509 
 	}
2510 2510 
 }
2511 2511
2512 
-func (s *DockerSuite) TestRunModePidContainerNotExists(c *check.C) {
2512 
+func (s *DockerSuite) TestRunModePIDContainerNotExists(c *check.C) {
2513 2513 
 	// Not applicable on Windows as uses Unix-specific capabilities
2514 2514 
 	testRequires(c, DaemonIsLinux)
2515 2515 
 	out, _, err := dockerCmdWithError("run", "-d", "--pid", "container:abcd1234", "busybox", "top")
... ... 
@@ -2518,7 +2518,7 @@ func (s *DockerSuite) TestRunModePidContainerNotExists(c *check.C) {
2518 2518 
 	}
2519 2519 
 }
2520 2520
2521 
-func (s *DockerSuite) TestRunModePidContainerNotRunning(c *check.C) {
2521 
+func (s *DockerSuite) TestRunModePIDContainerNotRunning(c *check.C) {
2522 2522 
 	// Not applicable on Windows as uses Unix-specific capabilities
2523 2523 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
2524 2524
... ... 
@@ -2576,7 +2576,7 @@ func (s *DockerSuite) TestContainerNetworkMode(c *check.C) {
2576 2576 
 	}
2577 2577 
 }
2578 2578
2579 
-func (s *DockerSuite) TestRunModePidHost(c *check.C) {
2579 
+func (s *DockerSuite) TestRunModePIDHost(c *check.C) {
2580 2580 
 	// Not applicable on Windows as uses Unix-specific capabilities
2581 2581 
 	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
2582 2582
... ... 
@@ -2958,7 +2958,7 @@ func (s *DockerSuite) TestRunContainerWithRmFlagCannotStartContainer(c *check.C)
2958 2958 
 	}
2959 2959 
 }
2960 2960
2961 
-func (s *DockerSuite) TestRunPidHostWithChildIsKillable(c *check.C) {
2961 
+func (s *DockerSuite) TestRunPIDHostWithChildIsKillable(c *check.C) {
2962 2962 
 	// Not applicable on Windows as uses Unix specific functionality
2963 2963 
 	testRequires(c, DaemonIsLinux, NotUserNamespace)
2964 2964 
 	name := "ibuildthecloud"
integration-cli/docker_cli_run_unix_test.go
History View file @ 7fb7a47
... ... 
@@ -1229,8 +1229,8 @@ func (s *DockerSuite) TestRunDeviceSymlink(c *check.C) {
1229 1229 
 	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "bb7df04e1b0a2570657527a7e108ae23", check.Commentf("expected output bb7df04e1b0a2570657527a7e108ae23"))
1230 1230 
 }
1231 1231
1232 
-// TestRunPidsLimit makes sure the pids cgroup is set with --pids-limit
1233 
-func (s *DockerSuite) TestRunPidsLimit(c *check.C) {
1232 
+// TestRunPIDsLimit makes sure the pids cgroup is set with --pids-limit
1233 
+func (s *DockerSuite) TestRunPIDsLimit(c *check.C) {
1234 1234 
 	testRequires(c, pidsLimit)
1235 1235
1236 1236 
 	file := "/sys/fs/cgroup/pids/pids.max"
integration-cli/docker_cli_volume_test.go
History View file @ 7fb7a47
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/go-check/check"
13 13 
 )
14 14
15 
-func (s *DockerSuite) TestVolumeCliCreate(c *check.C) {
15 
+func (s *DockerSuite) TestVolumeCLICreate(c *check.C) {
16 16 
 	dockerCmd(c, "volume", "create")
17 17
18 18 
 	_, err := runCommand(exec.Command(dockerBinary, "volume", "create", "-d", "nosuchdriver"))
... ... 
@@ -28,7 +28,7 @@ func (s *DockerSuite) TestVolumeCliCreate(c *check.C) {
28 28 
 	c.Assert(name, check.Equals, "test2")
29 29 
 }
30 30
31 
-func (s *DockerSuite) TestVolumeCliCreateOptionConflict(c *check.C) {
31 
+func (s *DockerSuite) TestVolumeCLICreateOptionConflict(c *check.C) {
32 32 
 	dockerCmd(c, "volume", "create", "test")
33 33 
 	out, _, err := dockerCmdWithError("volume", "create", "test", "--driver", "nosuchdriver")
34 34 
 	c.Assert(err, check.NotNil, check.Commentf("volume create exception name already in use with another driver"))
... ... 
@@ -43,7 +43,7 @@ func (s *DockerSuite) TestVolumeCliCreateOptionConflict(c *check.C) {
43 43 
 	c.Assert(err, check.NotNil, check.Commentf("Conflicting options: either specify --name or provide positional arg, not both"))
44 44 
 }
45 45
46 
-func (s *DockerSuite) TestVolumeCliInspect(c *check.C) {
46 
+func (s *DockerSuite) TestVolumeCLIInspect(c *check.C) {
47 47 
 	c.Assert(
48 48 
 		exec.Command(dockerBinary, "volume", "inspect", "doesntexist").Run(),
49 49 
 		check.Not(check.IsNil),
... ... 
@@ -60,7 +60,7 @@ func (s *DockerSuite) TestVolumeCliInspect(c *check.C) {
60 60 
 	c.Assert(strings.TrimSpace(out), check.Equals, "test")
61 61 
 }
62 62
63 
-func (s *DockerSuite) TestVolumeCliInspectMulti(c *check.C) {
63 
+func (s *DockerSuite) TestVolumeCLIInspectMulti(c *check.C) {
64 64 
 	dockerCmd(c, "volume", "create", "test1")
65 65 
 	dockerCmd(c, "volume", "create", "test2")
66 66 
 	dockerCmd(c, "volume", "create", "not-shown")
... ... 
@@ -80,7 +80,7 @@ func (s *DockerSuite) TestVolumeCliInspectMulti(c *check.C) {
80 80 
 	c.Assert(out, checker.Not(checker.Contains), "not-shown")
81 81 
 }
82 82
83 
-func (s *DockerSuite) TestVolumeCliLs(c *check.C) {
83 
+func (s *DockerSuite) TestVolumeCLILs(c *check.C) {
84 84 
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
85 85 
 	dockerCmd(c, "volume", "create", "aaa")
86 86
... ... 
@@ -154,7 +154,7 @@ func assertVolList(c *check.C, out string, expectVols []string) {
154 154 
 	c.Assert(volList, checker.DeepEquals, expectVols)
155 155 
 }
156 156
157 
-func (s *DockerSuite) TestVolumeCliLsFilterDangling(c *check.C) {
157 
+func (s *DockerSuite) TestVolumeCLILsFilterDangling(c *check.C) {
158 158 
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
159 159 
 	dockerCmd(c, "volume", "create", "testnotinuse1")
160 160 
 	dockerCmd(c, "volume", "create", "testisinuse1")
... ... 
@@ -217,19 +217,19 @@ func (s *DockerSuite) TestVolumeCliLsFilterDangling(c *check.C) {
217 217
218 218 
 }
219 219
220 
-func (s *DockerSuite) TestVolumeCliLsErrorWithInvalidFilterName(c *check.C) {
220 
+func (s *DockerSuite) TestVolumeCLILsErrorWithInvalidFilterName(c *check.C) {
221 221 
 	out, _, err := dockerCmdWithError("volume", "ls", "-f", "FOO=123")
222 222 
 	c.Assert(err, checker.NotNil)
223 223 
 	c.Assert(out, checker.Contains, "Invalid filter")
224 224 
 }
225 225
226 
-func (s *DockerSuite) TestVolumeCliLsWithIncorrectFilterValue(c *check.C) {
226 
+func (s *DockerSuite) TestVolumeCLILsWithIncorrectFilterValue(c *check.C) {
227 227 
 	out, _, err := dockerCmdWithError("volume", "ls", "-f", "dangling=invalid")
228 228 
 	c.Assert(err, check.NotNil)
229 229 
 	c.Assert(out, checker.Contains, "Invalid filter")
230 230 
 }
231 231
232 
-func (s *DockerSuite) TestVolumeCliRm(c *check.C) {
232 
+func (s *DockerSuite) TestVolumeCLIRm(c *check.C) {
233 233 
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
234 234 
 	out, _ := dockerCmd(c, "volume", "create")
235 235 
 	id := strings.TrimSpace(out)
... ... 
@@ -268,7 +268,7 @@ func (s *DockerSuite) TestVolumeCliRm(c *check.C) {
268 268 
 	)
269 269 
 }
270 270
271 
-func (s *DockerSuite) TestVolumeCliNoArgs(c *check.C) {
271 
+func (s *DockerSuite) TestVolumeCLINoArgs(c *check.C) {
272 272 
 	out, _ := dockerCmd(c, "volume")
273 273 
 	// no args should produce the cmd usage output
274 274 
 	usage := "Usage:	docker volume COMMAND"
... ... 
@@ -286,7 +286,7 @@ func (s *DockerSuite) TestVolumeCliNoArgs(c *check.C) {
286 286 
 	c.Assert(stderr, checker.Contains, "unknown flag: --no-such-flag")
287 287 
 }
288 288
289 
-func (s *DockerSuite) TestVolumeCliInspectTmplError(c *check.C) {
289 
+func (s *DockerSuite) TestVolumeCLIInspectTmplError(c *check.C) {
290 290 
 	out, _ := dockerCmd(c, "volume", "create")
291 291 
 	name := strings.TrimSpace(out)
292 292
... ... 
@@ -296,7 +296,7 @@ func (s *DockerSuite) TestVolumeCliInspectTmplError(c *check.C) {
296 296 
 	c.Assert(out, checker.Contains, "Template parsing error")
297 297 
 }
298 298
299 
-func (s *DockerSuite) TestVolumeCliCreateWithOpts(c *check.C) {
299 
+func (s *DockerSuite) TestVolumeCLICreateWithOpts(c *check.C) {
300 300 
 	testRequires(c, DaemonIsLinux)
301 301
302 302 
 	dockerCmd(c, "volume", "create", "-d", "local", "test", "--opt=type=tmpfs", "--opt=device=tmpfs", "--opt=o=size=1m,uid=1000")
... ... 
@@ -319,7 +319,7 @@ func (s *DockerSuite) TestVolumeCliCreateWithOpts(c *check.C) {
319 319 
 	c.Assert(found, checker.Equals, true)
320 320 
 }
321 321
322 
-func (s *DockerSuite) TestVolumeCliCreateLabel(c *check.C) {
322 
+func (s *DockerSuite) TestVolumeCLICreateLabel(c *check.C) {
323 323 
 	testVol := "testvolcreatelabel"
324 324 
 	testLabel := "foo"
325 325 
 	testValue := "bar"
... ... 
@@ -331,7 +331,7 @@ func (s *DockerSuite) TestVolumeCliCreateLabel(c *check.C) {
331 331 
 	c.Assert(strings.TrimSpace(out), check.Equals, testValue)
332 332 
 }
333 333
334 
-func (s *DockerSuite) TestVolumeCliCreateLabelMultiple(c *check.C) {
334 
+func (s *DockerSuite) TestVolumeCLICreateLabelMultiple(c *check.C) {
335 335 
 	testVol := "testvolcreatelabel"
336 336
337 337 
 	testLabels := map[string]string{
... ... 
@@ -358,7 +358,7 @@ func (s *DockerSuite) TestVolumeCliCreateLabelMultiple(c *check.C) {
358 358 
 	}
359 359 
 }
360 360
361 
-func (s *DockerSuite) TestVolumeCliLsFilterLabels(c *check.C) {
361 
+func (s *DockerSuite) TestVolumeCLILsFilterLabels(c *check.C) {
362 362 
 	testVol1 := "testvolcreatelabel-1"
363 363 
 	out, _, err := dockerCmdWithError("volume", "create", "--label", "foo=bar1", testVol1)
364 364 
 	c.Assert(err, check.IsNil)
... ... 
@@ -388,7 +388,7 @@ func (s *DockerSuite) TestVolumeCliLsFilterLabels(c *check.C) {
388 388 
 	c.Assert(len(outArr), check.Equals, 1, check.Commentf("\n%s", out))
389 389 
 }
390 390
391 
-func (s *DockerSuite) TestVolumeCliRmForceUsage(c *check.C) {
391 
+func (s *DockerSuite) TestVolumeCLIRmForceUsage(c *check.C) {
392 392 
 	out, _ := dockerCmd(c, "volume", "create")
393 393 
 	id := strings.TrimSpace(out)
394 394
... ... 
@@ -400,7 +400,7 @@ func (s *DockerSuite) TestVolumeCliRmForceUsage(c *check.C) {
400 400 
 	c.Assert(len(outArr), check.Equals, 1, check.Commentf("%s\n", out))
401 401 
 }
402 402
403 
-func (s *DockerSuite) TestVolumeCliRmForce(c *check.C) {
403 
+func (s *DockerSuite) TestVolumeCLIRmForce(c *check.C) {
404 404 
 	testRequires(c, SameHostDaemon, DaemonIsLinux)
405 405
406 406 
 	name := "test"
integration-cli/docker_deprecated_api_v124_test.go
History View file @ 7fb7a47
... ... 
@@ -15,7 +15,7 @@ func formatV123StartAPIURL(url string) string {
15 15 
 	return "/v1.23" + url
16 16 
 }
17 17
18 
-func (s *DockerSuite) TestDeprecatedContainerApiStartHostConfig(c *check.C) {
18 
+func (s *DockerSuite) TestDeprecatedContainerAPIStartHostConfig(c *check.C) {
19 19 
 	name := "test-deprecated-api-124"
20 20 
 	dockerCmd(c, "create", "--name", name, "busybox")
21 21 
 	config := map[string]interface{}{
... ... 
@@ -27,7 +27,7 @@ func (s *DockerSuite) TestDeprecatedContainerApiStartHostConfig(c *check.C) {
27 27 
 	c.Assert(string(body), checker.Contains, "was deprecated since v1.10")
28 28 
 }
29 29
30 
-func (s *DockerSuite) TestDeprecatedContainerApiStartVolumeBinds(c *check.C) {
30 
+func (s *DockerSuite) TestDeprecatedContainerAPIStartVolumeBinds(c *check.C) {
31 31 
 	// TODO Windows CI: Investigate further why this fails on Windows to Windows CI.
32 32 
 	testRequires(c, DaemonIsLinux)
33 33 
 	path := "/foo"
... ... 
@@ -58,7 +58,7 @@ func (s *DockerSuite) TestDeprecatedContainerApiStartVolumeBinds(c *check.C) {
58 58 
 }
59 59
60 60 
 // Test for GH#10618
61 
-func (s *DockerSuite) TestDeprecatedContainerApiStartDupVolumeBinds(c *check.C) {
61 
+func (s *DockerSuite) TestDeprecatedContainerAPIStartDupVolumeBinds(c *check.C) {
62 62 
 	// TODO Windows to Windows CI - Port this
63 63 
 	testRequires(c, DaemonIsLinux)
64 64 
 	name := "testdups"
... ... 
@@ -83,7 +83,7 @@ func (s *DockerSuite) TestDeprecatedContainerApiStartDupVolumeBinds(c *check.C)
83 83 
 	c.Assert(string(body), checker.Contains, "Duplicate mount point", check.Commentf("Expected failure due to duplicate bind mounts to same path, instead got: %q with error: %v", string(body), err))
84 84 
 }
85 85
86 
-func (s *DockerSuite) TestDeprecatedContainerApiStartVolumesFrom(c *check.C) {
86 
+func (s *DockerSuite) TestDeprecatedContainerAPIStartVolumesFrom(c *check.C) {
87 87 
 	// TODO Windows to Windows CI - Port this
88 88 
 	testRequires(c, DaemonIsLinux)
89 89 
 	volName := "voltst"
... ... 
@@ -91,7 +91,7 @@ func (s *DockerSuite) TestDeprecatedContainerApiStartVolumesFrom(c *check.C) {
91 91
92 92 
 	dockerCmd(c, "run", "--name", volName, "-v", volPath, "busybox")
93 93
94 
-	name := "TestContainerApiStartVolumesFrom"
94 
+	name := "TestContainerAPIStartVolumesFrom"
95 95 
 	config := map[string]interface{}{
96 96 
 		"Image":   "busybox",
97 97 
 		"Volumes": map[string]struct{}{volPath: {}},