Merge pull request #12828 from tdmackey/trivial-spelling

trivial: typo cleanup

builder/internals.go

@@ -490,7 +490,7 @@ func (b *Builder) processImageFrom(img *imagepkg.Image) error {
 		fmt.Fprintf(b.ErrStream, "# Executing %d build triggers\n", nTriggers)
 	}
 
-	// Copy the ONBUILD triggers, and remove them from the config, since the config will be commited.
+	// Copy the ONBUILD triggers, and remove them from the config, since the config will be committed.
 	onBuildTriggers := b.Config.OnBuild
 	b.Config.OnBuild = []string{}
 

contrib/docker-device-tool/device_tool.go

@@ -125,7 +125,7 @@ func main() {
 
 		err = devices.ResizePool(size)
 		if err != nil {
-			fmt.Println("Error resizeing pool: ", err)
+			fmt.Println("Error resizing pool: ", err)
 			os.Exit(1)
 		}
 

daemon/daemon.go

@@ -823,7 +823,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService
 	// Load storage driver
 	driver, err := graphdriver.New(config.Root, config.GraphOptions)
 	if err != nil {
-		return nil, fmt.Errorf("error intializing graphdriver: %v", err)
+		return nil, fmt.Errorf("error initializing graphdriver: %v", err)
 	}
 	logrus.Debugf("Using graph driver %s", driver)
 	// register cleanup for graph driver

daemon/networkdriver/ipallocator/allocator_test.go

@@ -601,7 +601,7 @@ func TestRegisterBadTwice(t *testing.T) {
 		Mask: []byte{255, 255, 255, 248},
 	}
 	if err := a.RegisterSubnet(network, subnet); err != ErrNetworkAlreadyRegistered {
-		t.Fatalf("Expecteded ErrNetworkAlreadyRegistered error, got %v", err)
+		t.Fatalf("Expected ErrNetworkAlreadyRegistered error, got %v", err)
 	}
 }
 

engine/streams_test.go

@@ -182,7 +182,7 @@ func TestInputAddEmpty(t *testing.T) {
 		t.Fatal(err)
 	}
 	if len(data) > 0 {
-		t.Fatalf("Read from empty input shoul yield no data")
+		t.Fatalf("Read from empty input should yield no data")
 	}
 }
 

integration-cli/docker_api_containers_test.go

@@ -643,7 +643,7 @@ func (s *DockerSuite) TestContainerApiCommit(c *check.C) {
 	// sanity check, make sure the image is what we think it is
 	out, err = exec.Command(dockerBinary, "run", img.Id, "ls", "/test").CombinedOutput()
 	if err != nil {
-		c.Fatalf("error checking commited image: %v - %q", err, string(out))
+		c.Fatalf("error checking committed image: %v - %q", err, string(out))
 	}
 }
 

integration-cli/docker_cli_attach_test.go

@@ -161,7 +161,7 @@ func (s *DockerSuite) TestAttachDisconnect(c *check.C) {
 		c.Fatal(err)
 	}
 	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("exepected 'hello', got %q", out)
+		c.Fatalf("expected 'hello', got %q", out)
 	}
 
 	if err := stdin.Close(); err != nil {
@@ -174,7 +174,7 @@ func (s *DockerSuite) TestAttachDisconnect(c *check.C) {
 		c.Fatal(err)
 	}
 	if running != "true" {
-		c.Fatal("exepected container to still be running")
+		c.Fatal("expected container to still be running")
 	}
 
 }

integration-cli/docker_cli_attach_unix_test.go

@@ -172,7 +172,7 @@ func (s *DockerSuite) TestAttachDetach(c *check.C) {
 		c.Fatal(err)
 	}
 	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("exepected 'hello', got %q", out)
+		c.Fatalf("expected 'hello', got %q", out)
 	}
 
 	// escape sequence
@@ -195,7 +195,7 @@ func (s *DockerSuite) TestAttachDetach(c *check.C) {
 		c.Fatal(err)
 	}
 	if running != "true" {
-		c.Fatal("exepected container to still be running")
+		c.Fatal("expected container to still be running")
 	}
 
 	go func() {
@@ -243,7 +243,7 @@ func (s *DockerSuite) TestAttachDetachTruncatedID(c *check.C) {
 		c.Fatal(err)
 	}
 	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("exepected 'hello', got %q", out)
+		c.Fatalf("expected 'hello', got %q", out)
 	}
 
 	// escape sequence
@@ -266,7 +266,7 @@ func (s *DockerSuite) TestAttachDetachTruncatedID(c *check.C) {
 		c.Fatal(err)
 	}
 	if running != "true" {
-		c.Fatal("exepected container to still be running")
+		c.Fatal("expected container to still be running")
 	}
 
 	go func() {

integration-cli/docker_cli_build_test.go

@@ -3408,7 +3408,7 @@ func (s *DockerSuite) TestBuildVerifyIntString(c *check.C) {
 
 	out, rc, err := runCommandWithOutput(exec.Command(dockerBinary, "inspect", name))
 	if rc != 0 || err != nil {
-		c.Fatalf("Unexcepted error from inspect: rc: %v  err: %v", rc, err)
+		c.Fatalf("Unexpected error from inspect: rc: %v  err: %v", rc, err)
 	}
 
 	if !strings.Contains(out, "\"123\"") {
@@ -5033,7 +5033,7 @@ RUN echo "  \
 
 	expecting := "\n    foo  \n"
 	if !strings.Contains(out, expecting) {
-		c.Fatalf("Bad output: %q expecting to contian %q", out, expecting)
+		c.Fatalf("Bad output: %q expecting to contain %q", out, expecting)
 	}
 
 }

integration-cli/docker_cli_commit_test.go

@@ -262,7 +262,7 @@ func (s *DockerSuite) TestCommitMergeConfigRun(c *check.C) {
 
 	out, _ = dockerCmd(c, "run", "--name", name, "commit-test")
 	if strings.TrimSpace(out) != "testing" {
-		c.Fatal("run config in commited container was not merged")
+		c.Fatal("run config in committed container was not merged")
 	}
 
 	type cfg struct {

integration-cli/docker_cli_daemon_test.go

@@ -860,7 +860,7 @@ func (s *DockerSuite) TestDaemonwithwrongkey(c *check.C) {
 
 	if err := d1.Start(); err == nil {
 		d1.Stop()
-		c.Fatalf("It should not be succssful to start daemon with wrong key: %v", err)
+		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
 	}
 
 	content, _ := ioutil.ReadFile(d1.logFile.Name())

integration-cli/docker_cli_ps_test.go

@@ -547,7 +547,7 @@ func (s *DockerSuite) TestPsListContainersFilterExited(c *check.C) {
 	}
 	ids = strings.Split(strings.TrimSpace(out), "\n")
 	if len(ids) != 2 {
-		c.Fatalf("Should be 2 zero exited containerst got %d", len(ids))
+		c.Fatalf("Should be 2 zero exited containers got %d", len(ids))
 	}
 	if ids[0] != secondNonZero {
 		c.Fatalf("First in list should be %q, got %q", secondNonZero, ids[0])

integration-cli/docker_cli_push_test.go

@@ -41,7 +41,7 @@ func (s *DockerRegistrySuite) TestPushUntagged(c *check.C) {
 	expected := "Repository does not exist"
 	pushCmd := exec.Command(dockerBinary, "push", repoName)
 	if out, _, err := runCommandWithOutput(pushCmd); err == nil {
-		c.Fatalf("pushing the image to the private registry should have failed: outuput %q", out)
+		c.Fatalf("pushing the image to the private registry should have failed: output %q", out)
 	} else if !strings.Contains(out, expected) {
 		c.Fatalf("pushing the image failed with an unexpected message: expected %q, got %q", expected, out)
 	}
@@ -53,7 +53,7 @@ func (s *DockerRegistrySuite) TestPushBadTag(c *check.C) {
 	expected := "does not exist"
 	pushCmd := exec.Command(dockerBinary, "push", repoName)
 	if out, _, err := runCommandWithOutput(pushCmd); err == nil {
-		c.Fatalf("pushing the image to the private registry should have failed: outuput %q", out)
+		c.Fatalf("pushing the image to the private registry should have failed: output %q", out)
 	} else if !strings.Contains(out, expected) {
 		c.Fatalf("pushing the image failed with an unexpected message: expected %q, got %q", expected, out)
 	}

integration-cli/docker_cli_rmi_test.go

@@ -108,7 +108,7 @@ func (s *DockerSuite) TestRmiImgIDForce(c *check.C) {
 	runCmd = exec.Command(dockerBinary, "rmi", imgID)
 	out, _, err = runCommandWithOutput(runCmd)
 	if err == nil || !strings.Contains(out, fmt.Sprintf("Conflict, cannot delete image %s because it is tagged in multiple repositories, use -f to force", imgID)) {
-		c.Fatalf("rmi tagged in mutiple repos should have failed without force:%s, %v", out, err)
+		c.Fatalf("rmi tagged in multiple repos should have failed without force:%s, %v", out, err)
 	}
 
 	dockerCmd(c, "rmi", "-f", imgID)

integration-cli/docker_cli_run_test.go

@@ -329,7 +329,7 @@ func (s *DockerSuite) TestRunLinksContainerWithContainerId(c *check.C) {
 	cmd = exec.Command(dockerBinary, "inspect", "-f", "{{.NetworkSettings.IPAddress}}", cID)
 	ip, _, _, err := runCommandWithStdoutStderr(cmd)
 	if err != nil {
-		c.Fatalf("faild to inspect container: %v, output: %q", err, ip)
+		c.Fatalf("failed to inspect container: %v, output: %q", err, ip)
 	}
 	ip = strings.TrimSpace(ip)
 	cmd = exec.Command(dockerBinary, "run", "--link", cID+":test", "busybox", "/bin/cat", "/etc/hosts")
@@ -2067,7 +2067,7 @@ func (s *DockerSuite) TestRunCidFileCleanupIfEmpty(c *check.C) {
 	if err == nil {
 		c.Fatalf("Run without command must fail. out=%s", out)
 	} else if !strings.Contains(out, "No command specified") {
-		c.Fatalf("Run without command failed with wrong outpuc. out=%s\nerr=%v", out, err)
+		c.Fatalf("Run without command failed with wrong output. out=%s\nerr=%v", out, err)
 	}
 
 	if _, err := os.Stat(tmpCidFile); err == nil {

integration-cli/docker_cli_run_unix_test.go

@@ -213,7 +213,7 @@ func (s *DockerSuite) TestRunAttachDetach(c *check.C) {
 		c.Fatal(err)
 	}
 	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("exepected 'hello', got %q", out)
+		c.Fatalf("expected 'hello', got %q", out)
 	}
 
 	// escape sequence
@@ -236,7 +236,7 @@ func (s *DockerSuite) TestRunAttachDetach(c *check.C) {
 		c.Fatal(err)
 	}
 	if running != "true" {
-		c.Fatal("exepected container to still be running")
+		c.Fatal("expected container to still be running")
 	}
 
 	go func() {

integration-cli/docker_cli_save_load_test.go

@@ -333,7 +333,7 @@ func (s *DockerSuite) TestSaveRepoWithMultipleImages(c *check.C) {
 	sort.Strings(actual)
 	sort.Strings(expected)
 	if !reflect.DeepEqual(expected, actual) {
-		c.Fatalf("achive does not contains the right layers: got %v, expected %v", actual, expected)
+		c.Fatalf("archive does not contains the right layers: got %v, expected %v", actual, expected)
 	}
 
 }

integration-cli/docker_cli_start_test.go

@@ -205,7 +205,7 @@ func (s *DockerSuite) TestStartMultipleContainers(c *check.C) {
 		c.Fatal("Container should be stopped")
 	}
 
-	// start all the three containers, container `child_first` start first which should be faild
+	// start all the three containers, container `child_first` start first which should be failed
 	// container 'parent' start second and then start container 'child_second'
 	cmd = exec.Command(dockerBinary, "start", "child_first", "parent", "child_second")
 	out, _, err = runCommandWithOutput(cmd)

integration/api_test.go

@@ -434,7 +434,7 @@ func TestGetEnabledCors(t *testing.T) {
 		t.Errorf("Expected header Access-Control-Allow-Headers to be \"Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth\", %s found.", allowHeaders)
 	}
 	if allowMethods != "GET, POST, DELETE, PUT, OPTIONS" {
-		t.Errorf("Expected hearder Access-Control-Allow-Methods to be \"GET, POST, DELETE, PUT, OPTIONS\", %s found.", allowMethods)
+		t.Errorf("Expected header Access-Control-Allow-Methods to be \"GET, POST, DELETE, PUT, OPTIONS\", %s found.", allowMethods)
 	}
 }
 
@@ -648,7 +648,7 @@ func TestConstainersStartChunkedEncodingHostConfig(t *testing.T) {
 	}
 
 	if c.HostConfig.Binds[0] != "/tmp:/foo" {
-		t.Fatal("Chunked encoding not properly handled, execpted binds to be /tmp:/foo, got:", c.HostConfig.Binds[0])
+		t.Fatal("Chunked encoding not properly handled, expected binds to be /tmp:/foo, got:", c.HostConfig.Binds[0])
 	}
 }
 

integration/container_test.go

@@ -213,7 +213,7 @@ func BenchmarkRunParallel(b *testing.B) {
 				return
 			}
 			// if string(output) != "foo" {
-			// 	complete <- fmt.Errorf("Unexecpted output: %v", string(output))
+			// 	complete <- fmt.Errorf("Unexpected output: %v", string(output))
 			// }
 			if err := daemon.Rm(container); err != nil {
 				complete <- err

integration/runtime_test.go

@@ -837,7 +837,7 @@ func TestDestroyWithInitLayer(t *testing.T) {
 
 	// Make sure that the container does not exist in the driver
 	if _, err := driver.Get(container.ID, ""); err == nil {
-		t.Fatal("Conttainer should not exist in the driver")
+		t.Fatal("Container should not exist in the driver")
 	}
 
 	// Make sure that the init layer is removed from the driver

integration/utils.go

@@ -41,7 +41,7 @@ func waitContainerStart(t *testing.T, timeout time.Duration) *daemon.Container {
 	})
 
 	if container == nil {
-		t.Fatal("An error occured while waiting for the container to start")
+		t.Fatal("An error occurred while waiting for the container to start")
 	}
 
 	return container

pkg/archive/archive_windows_test.go

@@ -20,7 +20,7 @@ func TestCanonicalTarNameForPath(t *testing.T) {
 		if out, err := CanonicalTarNameForPath(v.in); err != nil && !v.shouldFail {
 			t.Fatalf("cannot get canonical name for path: %s: %v", v.in, err)
 		} else if v.shouldFail && err == nil {
-			t.Fatalf("canonical path call should have pailed with error. in=%s out=%s", v.in, out)
+			t.Fatalf("canonical path call should have failed with error. in=%s out=%s", v.in, out)
 		} else if !v.shouldFail && out != v.expected {
 			t.Fatalf("wrong canonical tar name. expected:%s got:%s", v.expected, out)
 		}

pkg/graphdb/graphdb_test.go

@@ -52,7 +52,7 @@ func TestGetRootEntity(t *testing.T) {
 		t.Fatal("Entity should not be nil")
 	}
 	if e.ID() != "0" {
-		t.Fatalf("Enity id should be 0, got %s", e.ID())
+		t.Fatalf("Entity id should be 0, got %s", e.ID())
 	}
 }
 
@@ -74,7 +74,7 @@ func TestSetDuplicateEntity(t *testing.T) {
 		t.Fatal(err)
 	}
 	if _, err := db.Set("/foo", "43"); err == nil {
-		t.Fatalf("Creating an entry with a duplciate path did not cause an error")
+		t.Fatalf("Creating an entry with a duplicate path did not cause an error")
 	}
 }
 

pkg/term/winconsole/console_windows_test.go

@@ -18,7 +18,7 @@ func helpsTestParseInt16OrDefault(t *testing.T, expectedValue int16, shouldFail
 		t.Errorf(format, args)
 	}
 	if expectedValue != value {
-		t.Errorf("The value returned does not macth expected\n\tExpected:%v\n\t:Actual%v", expectedValue, value)
+		t.Errorf("The value returned does not match expected\n\tExpected:%v\n\t:Actual%v", expectedValue, value)
 		t.Errorf(format, args)
 	}
 }

registry/registry_test.go

@@ -736,7 +736,7 @@ func TestSearchRepositories(t *testing.T) {
 	}
 	assertEqual(t, results.NumResults, 1, "Expected 1 search results")
 	assertEqual(t, results.Query, "fakequery", "Expected 'fakequery' as query")
-	assertEqual(t, results.Results[0].StarCount, 42, "Expected 'fakeimage' a ot hae 42 stars")
+	assertEqual(t, results.Results[0].StarCount, 42, "Expected 'fakeimage' to have 42 stars")
 }
 
 func TestValidRemoteName(t *testing.T) {

runconfig/config_test.go

@@ -104,7 +104,7 @@ func TestParseRunVolumes(t *testing.T) {
 	if config, hostConfig := mustParse(t, "-v /tmp -v /var"); hostConfig.Binds != nil {
 		t.Fatalf("Error parsing volume flags, `-v /tmp -v /var` should not mount-bind anything. Received %v", hostConfig.Binds)
 	} else if _, exists := config.Volumes["/tmp"]; !exists {
-		t.Fatalf("Error parsing volume flags, `-v /tmp` is missing from volumes. Recevied %v", config.Volumes)
+		t.Fatalf("Error parsing volume flags, `-v /tmp` is missing from volumes. Received %v", config.Volumes)
 	} else if _, exists := config.Volumes["/var"]; !exists {
 		t.Fatalf("Error parsing volume flags, `-v /var` is missing from volumes. Received %v", config.Volumes)
 	}

runconfig/merge.go

@@ -41,7 +41,7 @@ func Merge(userConf, imageConf *Config) error {
 	}
 	if len(imageConf.PortSpecs) > 0 {
 		// FIXME: I think we can safely remove this. Leaving it for now for the sake of reverse-compat paranoia.
-		logrus.Debugf("Migrating image port specs to containter: %s", strings.Join(imageConf.PortSpecs, ", "))
+		logrus.Debugf("Migrating image port specs to container: %s", strings.Join(imageConf.PortSpecs, ", "))
 		if userConf.ExposedPorts == nil {
 			userConf.ExposedPorts = make(nat.PortSet)
 		}

volumes/repository.go

@@ -58,7 +58,7 @@ func (r *Repository) newVolume(path string, writable bool) (*Volume, error) {
 	path = filepath.Clean(path)
 
 	// Ignore the error here since the path may not exist
-	// Really just want to make sure the path we are using is real(or non-existant)
+	// Really just want to make sure the path we are using is real(or nonexistent)
 	if cleanPath, err := filepath.EvalSymlinks(path); err == nil {
 		path = cleanPath
 	}