@@ -224,7 +224,6 @@ func (s *DockerAPISuite) TestPostContainersAttach(c *testing.T) {

 // , contenttype, …), if receive a successful "101 Switching Protocols" response return

 // a `io.WriteCloser` and `bufio.Reader`

 func requestHijack(method, endpoint string, data io.Reader, ct, daemon string, modifiers ...func(*http.Request)) (io.WriteCloser, *bufio.Reader, error) {

-

 	hostURL, err := client.ParseHostURL(daemon)

 	if err != nil {

 		return nil, nil, errors.Wrap(err, "parse daemon host error")

@@ -427,7 +427,6 @@ func (s *DockerAPISuite) TestBuildChownOnCopy(c *testing.T) {

 }

 func (s *DockerAPISuite) TestBuildCopyCacheOnFileChange(c *testing.T) {

-

 	dockerfile := `FROM busybox

 COPY file /file`

@@ -468,7 +467,6 @@ COPY file /file`

 }

 func (s *DockerAPISuite) TestBuildAddCacheOnFileChange(c *testing.T) {

-

 	dockerfile := `FROM busybox

 ADD file /file`

@@ -545,7 +545,6 @@ func (s *DockerAPISuite) TestContainerAPICreate(c *testing.T) {

 }

 func (s *DockerAPISuite) TestContainerAPICreateEmptyConfig(c *testing.T) {

-

 	cli, err := client.NewClientWithOpts(client.FromEnv)

 	assert.NilError(c, err)

 	defer cli.Close()

@@ -1070,7 +1069,6 @@ func (s *DockerAPISuite) TestContainerAPICopyResourcePathEmptyPre124(c *testing.

 	b, err := request.ReadBody(body)

 	assert.NilError(c, err)

 	assert.Assert(c, is.Regexp("^Path cannot be empty\n$", string(b)))

-

 }

 func (s *DockerAPISuite) TestContainerAPICopyResourcePathNotFoundPre124(c *testing.T) {

@@ -1092,7 +1090,6 @@ func (s *DockerAPISuite) TestContainerAPICopyResourcePathNotFoundPre124(c *testi

 	b, err := request.ReadBody(body)

 	assert.NilError(c, err)

 	assert.Assert(c, is.Regexp("^Could not find the file /notexist in container "+name+"\n$", string(b)))

-

 }

 func (s *DockerAPISuite) TestContainerAPICopyContainerNotFoundPr124(c *testing.T) {

@@ -1230,7 +1227,6 @@ func (s *DockerAPISuite) TestContainerAPIDeleteRemoveVolume(c *testing.T) {

 // Regression test for https://github.com/docker/docker/issues/6231

 func (s *DockerAPISuite) TestContainerAPIChunkedEncoding(c *testing.T) {

-

 	config := map[string]interface{}{

 		"Image":     "busybox",

 		"Cmd":       append([]string{"/bin/sh", "-c"}, sleepCommandForDaemonPlatform()...),

@@ -1920,7 +1916,6 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsValidation(c *testing.T) {

 				msg: "Source must not be specified",

 			},

 		}...)

-

 	}

 	apiClient, err := client.NewClientWithOpts(client.FromEnv)

 	assert.NilError(c, err)

@@ -2148,7 +2143,6 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 			assert.NilError(c, err)

 			switch {

-

 			// Named volumes still exist after the container is removed

 			case x.spec.Type == "volume" && len(x.spec.Source) > 0:

 				_, err := apiclient.VolumeInspect(ctx, mountPoint.Name)

@@ -147,7 +147,6 @@ func (s *DockerAPISuite) TestAPIImagesImportBadSrc(c *testing.T) {

 		assert.Equal(c, res.StatusCode, te.statusExp)

 		assert.Equal(c, res.Header.Get("Content-Type"), "application/json")

 	}

-

 }

 // #14846

@@ -31,7 +31,6 @@ func (s *DockerAPISuite) TestInspectAPIContainerResponse(c *testing.T) {

 		cases = []acase{

 			{"v1.25", append(keysBase, "Mounts")},

 		}

-

 	} else {

 		cases = []acase{

 			{"v1.20", append(keysBase, "Mounts")},

@@ -51,7 +50,7 @@ func (s *DockerAPISuite) TestInspectAPIContainerResponse(c *testing.T) {

 			assert.Check(c, ok, "%s does not exist in response for version %s", key, cs.version)

 		}

-		//Issue #6830: type not properly converted to JSON/back

+		// Issue #6830: type not properly converted to JSON/back

 		_, ok := inspectJSON["Path"].(bool)

 		assert.Assert(c, !ok, "Path of `true` should not be converted to boolean `true` via JSON marshalling")

 	}

@@ -125,5 +125,4 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *testing.T) {

 	d1.UpdateService(c, d1.GetService(c, id), setInstances(instances))

 	poll.WaitOn(c, pollCheck(c, d1.CheckActiveContainerCount, checker.Equals(instances-d2ContainerCount)), poll.WithTimeout(defaultReconciliationTimeout))

 	poll.WaitOn(c, pollCheck(c, d2.CheckActiveContainerCount, checker.Equals(d2ContainerCount)), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

@@ -120,7 +120,6 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesMultipleAgents(c *testing.T) {

 	instances = 5

 	d1.UpdateService(c, d1.GetService(c, id), setInstances(instances))

 	poll.WaitOn(c, pollCheck(c, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d3.CheckActiveContainerCount), checker.Equals(instances)), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

 func (s *DockerSwarmSuite) TestAPISwarmServicesCreateGlobal(c *testing.T) {

@@ -193,7 +192,6 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *testing.T) {

 	// 2nd batch

 	poll.WaitOn(c, pollCheck(c, daemons[0].CheckRunningTaskImages, checker.DeepEquals(map[string]int{image1: instances})), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

 func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateStartFirst(c *testing.T) {

@@ -294,7 +292,6 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateStartFirst(c *testing.T) {

 	// 2nd batch

 	poll.WaitOn(c, pollCheck(c, d.CheckRunningTaskImages, checker.DeepEquals(map[string]int{image1: instances})), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

 func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *testing.T) {

@@ -333,7 +330,6 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *testing.T) {

 	assert.NilError(c, err, out)

 	poll.WaitOn(c, pollCheck(c, daemons[0].CheckRunningTaskImages, checker.DeepEquals(map[string]int{image1: instances})), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

 func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintRole(c *testing.T) {

@@ -56,7 +56,6 @@ func (s *DockerCLIAttachSuite) TestAttachClosedOnContainerStop(c *testing.T) {

 	case <-time.After(attachWait):

 		c.Fatal("timed out without attach returning")

 	}

-

 }

 func (s *DockerCLIAttachSuite) TestAttachAfterDetach(c *testing.T) {

@@ -108,7 +108,6 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementVolume(c *testing.T

 	if _, ok := volumes[volumePath]; !ok {

 		c.Fatal("Volume " + volumePath + " from environment not in Config.Volumes on image")

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementExpose(c *testing.T) {

@@ -133,7 +132,6 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementExpose(c *testing.T

 			c.Fatalf("Exposed port %d from environment not in Config.ExposedPorts on image", p)

 		}

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementWorkdir(c *testing.T) {

@@ -240,7 +238,6 @@ func (s *DockerCLIBuildSuite) TestBuildEnvironmentReplacementEnv(c *testing.T) {

 	if envCount != 4 {

 		c.Fatalf("Didn't find all env vars - only saw %d\n%s", envCount, envResult)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildHandleEscapesInVolume(c *testing.T) {

@@ -308,7 +305,6 @@ func (s *DockerCLIBuildSuite) TestBuildOnBuildLowercase(c *testing.T) {

 	if strings.Contains(result.Combined(), "ONBUILD ONBUILD") {

 		c.Fatalf("Got an ONBUILD ONBUILD error with no error: got %s", result.Combined())

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEnvEscapes(c *testing.T) {

@@ -325,7 +321,6 @@ func (s *DockerCLIBuildSuite) TestBuildEnvEscapes(c *testing.T) {

 	if strings.TrimSpace(out) != "$" {

 		c.Fatalf("Env TEST was not overwritten with bar when foo was supplied to dockerfile: was %q", strings.TrimSpace(out))

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEnvOverwrite(c *testing.T) {

@@ -342,7 +337,6 @@ func (s *DockerCLIBuildSuite) TestBuildEnvOverwrite(c *testing.T) {

 	if strings.TrimSpace(out) != "bar" {

 		c.Fatalf("Env TEST was not overwritten with bar when foo was supplied to dockerfile: was %q", strings.TrimSpace(out))

 	}

-

 }

 // FIXME(vdemeester) why we disabled cache here ?

@@ -377,7 +371,6 @@ ONBUILD ENTRYPOINT ["echo"]`))

 	if !regexp.MustCompile(`(?m)^hello world`).MatchString(out) {

 		c.Fatal("got malformed output from onbuild", out)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildCacheAdd(c *testing.T) {

@@ -447,7 +440,6 @@ ADD %s/file /`

 	if out == out2 {

 		c.Fatalf("MTime didn't change:\nOrigin:%s\nNew:%s", out, out2)

 	}

-

 }

 // Regression for https://github.com/docker/docker/pull/27805

@@ -682,7 +674,6 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcard(c *testing.T) {

 	if id1 != id2 {

 		c.Fatal("didn't use the cache")

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildCopyWildcardInName(c *testing.T) {

@@ -728,7 +719,6 @@ func (s *DockerCLIBuildSuite) TestBuildCopyWildcardCache(c *testing.T) {

 	if id1 != id2 {

 		c.Fatal("didn't use the cache")

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildAddSingleFileToNonExistingDir(c *testing.T) {

@@ -1012,7 +1002,6 @@ func (s *DockerCLIBuildSuite) TestBuildAddBadLinks(c *testing.T) {

 	if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) {

 		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildAddBadLinksVolume(c *testing.T) {

@@ -1053,7 +1042,6 @@ func (s *DockerCLIBuildSuite) TestBuildAddBadLinksVolume(c *testing.T) {

 	if _, err := os.Stat(nonExistingFile); err == nil || !os.IsNotExist(err) {

 		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)

 	}

-

 }

 // Issue #5270 - ensure we throw a better error than "unexpected EOF"

@@ -1131,7 +1119,6 @@ func (s *DockerCLIBuildSuite) TestBuildWithInaccessibleFilesInContext(c *testing

 		if !strings.Contains(result.Combined(), "error checking context") {

 			c.Fatalf("output should've contained the string: error checking context\ngot:%s", result.Combined())

 		}

-

 	}

 	{

 		name := "testlinksok"

@@ -1195,7 +1182,6 @@ func (s *DockerCLIBuildSuite) TestBuildForceRm(c *testing.T) {

 	if containerCountBefore != containerCountAfter {

 		c.Fatalf("--force-rm shouldn't have left containers behind")

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildRm(c *testing.T) {

@@ -1273,7 +1259,6 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumes(c *testing.T) {

 	if !equal {

 		c.Fatalf("Volumes %s, expected %s", result, expected)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildMaintainer(c *testing.T) {

@@ -1540,7 +1525,6 @@ func (s *DockerCLIBuildSuite) TestBuildContextCleanup(c *testing.T) {

 	if err = compareDirectoryEntries(entries, entriesFinal); err != nil {

 		c.Fatalf("context should have been deleted, but wasn't")

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildContextCleanupFailedBuild(c *testing.T) {

@@ -1564,7 +1548,6 @@ func (s *DockerCLIBuildSuite) TestBuildContextCleanupFailedBuild(c *testing.T) {

 	if err = compareDirectoryEntries(entries, entriesFinal); err != nil {

 		c.Fatalf("context should have been deleted, but wasn't")

 	}

-

 }

 // compareDirectoryEntries compares two sets of DirEntry (usually taken from a directory)

@@ -1724,7 +1707,6 @@ func (s *DockerCLIBuildSuite) TestBuildEmptyEntrypoint(c *testing.T) {

 	if res != expected {

 		c.Fatalf("Entrypoint %s, expected %s", res, expected)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEntrypoint(c *testing.T) {

@@ -1738,7 +1720,6 @@ func (s *DockerCLIBuildSuite) TestBuildEntrypoint(c *testing.T) {

 	if res != expected {

 		c.Fatalf("Entrypoint %s, expected %s", res, expected)

 	}

-

 }

 // #6445 ensure ONBUILD triggers aren't committed to grandchildren

@@ -2174,7 +2155,6 @@ func (s *DockerCLIBuildSuite) TestBuildWithVolumeOwnership(c *testing.T) {

 	if expected := "daemon   daemon"; !strings.Contains(out, expected) {

 		c.Fatalf("expected %s received %s", expected, out)

 	}

-

 }

 // testing #1405 - config.Cmd does not get cleaned up if

@@ -2282,7 +2262,6 @@ docker.com>"

 	if res != "\"Docker IO <io@docker.com>\"" {

 		c.Fatalf("Parsed string did not match the escaped string. Got: %q", res)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildVerifyIntString(c *testing.T) {

@@ -2297,7 +2276,6 @@ func (s *DockerCLIBuildSuite) TestBuildVerifyIntString(c *testing.T) {

 	if !strings.Contains(out, "\"123\"") {

 		c.Fatalf("Output does not contain the int as a string:\n%s", out)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildDockerignore(c *testing.T) {

@@ -3215,7 +3193,6 @@ func (s *DockerCLIBuildSuite) TestBuildCmdShDashC(c *testing.T) {

 	if res != expected {

 		c.Fatalf("Expected value %s not in Config.Cmd: %s", expected, res)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildCmdSpaces(c *testing.T) {

@@ -3426,7 +3403,6 @@ func (s *DockerCLIBuildSuite) TestBuildLabelsCache(c *testing.T) {

 	if id1 == id2 {

 		c.Fatalf("Build 6 should have worked & NOT used the cache(%s,%s)", id1, id2)

 	}

-

 }

 // FIXME(vdemeester) port to docker/cli e2e tests (api tests should test suppressOutput option though)

@@ -3477,7 +3453,6 @@ func (s *DockerCLIBuildSuite) TestBuildNotVerboseSuccess(c *testing.T) {

 			c.Fatalf("Test %s expected stderr to be empty, but it is [%#v]", te.Name, result.Stderr())

 		}

 	}

-

 }

 // FIXME(vdemeester) migrate to docker/cli tests

@@ -3702,7 +3677,6 @@ CMD cat /foo/file`),

 	if out != expected {

 		c.Fatalf("expected file contents for /foo/file to be %q but received %q", expected, out)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildFromMixedcaseDockerfile(c *testing.T) {

@@ -3752,7 +3726,6 @@ RUN find /tmp/`}))

 		!strings.Contains(result.Combined(), "/tmp/Dockerfile") {

 		c.Fatalf("Missing proper output: %s", result.Combined())

 	}

-

 }

 // FIXME(vdemeester) should migrate to docker/cli tests

@@ -3778,7 +3751,6 @@ RUN sh -c "find /tmp/" # sh -c is needed on Windows to use the correct find`)

 		!strings.Contains(result.Combined(), "/tmp/Dockerfile") {

 		c.Fatalf("Missing proper output: %s", result.Combined())

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildFromOfficialNames(c *testing.T) {

@@ -3859,7 +3831,6 @@ func (s *DockerCLIBuildSuite) TestBuildSpaces(c *testing.T) {

 	if strings.ReplaceAll(e1, " ", "") != strings.ReplaceAll(e2, " ", "") {

 		c.Fatalf("Build 4's error wasn't the same as build 1's\n1:%s\n4:%s", result1.Error, result2.Error)

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildSpacesWithQuotes(c *testing.T) {

@@ -3937,7 +3908,6 @@ func (s *DockerCLIBuildSuite) TestBuildMissingArgs(c *testing.T) {

 			Err:      cmd + " requires",

 		})

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildEmptyScratch(c *testing.T) {

@@ -4109,7 +4079,6 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArg(c *testing.T) {

 			ARG %s

 			RUN echo $%s

 			CMD echo $%s`, envKey, envKey, envKey)

-

 	}

 	buildImage(imgName,

 		cli.WithFlags("--build-arg", fmt.Sprintf("%s=%s", envKey, envVal)),

@@ -4846,7 +4815,6 @@ func (s *DockerCLIBuildSuite) TestBuildFollowSymlinkToDir(c *testing.T) {

 	assert.Assert(c, !strings.Contains(result.Combined(), "Using cache"))

 	out = cli.DockerCmd(c, "run", "--rm", name, "cat", "abc", "def").Combined()

 	assert.Assert(c, cmp.Regexp("^barbax$", out))

-

 }

 // TestBuildSymlinkBasename tests that target file gets basename from symlink,

@@ -4869,7 +4837,6 @@ func (s *DockerCLIBuildSuite) TestBuildSymlinkBasename(c *testing.T) {

 	out := cli.DockerCmd(c, "run", "--rm", name, "cat", "asymlink").Combined()

 	assert.Assert(c, cmp.Regexp("^bar$", out))

-

 }

 // #17827

@@ -5374,7 +5341,6 @@ func (s *DockerCLIBuildSuite) TestBuildCmdShellArgsEscaped(c *testing.T) {

 	if res != `["ipconfig"]` {

 		c.Fatalf("CMD incorrect in Config.Cmd: got %v", res)

 	}

-

 }

 // Test case for #24912.

@@ -5614,7 +5580,6 @@ func (s *DockerCLIBuildSuite) TestBuildWithExtraHostInvalidFormat(c *testing.T)

 			ExitCode: 125,

 		})

 	}

-

 }

 func (s *DockerCLIBuildSuite) TestBuildMultiStageCopyFromSyntax(c *testing.T) {

@@ -237,7 +237,6 @@ func (s *DockerRegistrySuite) TestListImagesWithoutDigests(c *testing.T) {

 }

 func (s *DockerRegistrySuite) TestListImagesWithDigests(c *testing.T) {

-

 	// setup image1

 	digest1, err := setupImageWithTag(c, "tag1")

 	assert.NilError(c, err, "error setting up image")

@@ -330,7 +329,7 @@ func (s *DockerRegistrySuite) TestListDanglingImagesWithDigests(c *testing.T) {

 	assert.Assert(c, re1.MatchString(out), "expected %q: %s", re1.String(), out)

 	// setup image2

 	digest2, err := setupImageWithTag(c, "dangle2")

-	//error setting up image

+	// error setting up image

 	assert.NilError(c, err)

 	imageReference2 := fmt.Sprintf("%s@%s", repoName, digest2)

 	c.Logf("imageReference2 = %s", imageReference2)

@@ -61,7 +61,6 @@ func (s *DockerCLICreateSuite) TestCreateArgs(c *testing.T) {

 	if len(cont.Args) != len(expected) || b {

 		c.Fatalf("Unexpected args. Expected %v, received: %v", expected, cont.Args)

 	}

-

 }

 // Make sure we can grow the container's rootfs at creation time.

@@ -135,9 +134,7 @@ func (s *DockerCLICreateSuite) TestCreateWithPortRange(c *testing.T) {

 	for k, v := range cont.HostConfig.PortBindings {

 		assert.Equal(c, len(v), 1, fmt.Sprintf("Expected 1 ports binding, for the port  %s but found %s", k, v))

 		assert.Equal(c, k.Port(), v[0].HostPort, fmt.Sprintf("Expected host port %s to match published port %s", k.Port(), v[0].HostPort))

-

 	}

-

 }

 func (s *DockerCLICreateSuite) TestCreateWithLargePortRange(c *testing.T) {

@@ -165,7 +162,6 @@ func (s *DockerCLICreateSuite) TestCreateWithLargePortRange(c *testing.T) {

 		assert.Equal(c, len(v), 1)

 		assert.Equal(c, k.Port(), v[0].HostPort, fmt.Sprintf("Expected host port %s to match published port %s", k.Port(), v[0].HostPort))

 	}

-

 }

 // "test123" should be printed by docker create + start

@@ -194,7 +190,6 @@ func (s *DockerCLICreateSuite) TestCreateVolumesCreated(c *testing.T) {

 	if err != nil {

 		c.Fatalf("Error statting volume host path: %q", err)

 	}

-

 }

 func (s *DockerCLICreateSuite) TestCreateLabels(c *testing.T) {

@@ -172,7 +172,6 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *testing.T) {

 	// both running

 	testRun(map[string]bool{"top1": true, "top2": true, "exit": true}, "After second daemon restart: ")

-

 }

 func (s *DockerDaemonSuite) TestDaemonRestartOnFailure(c *testing.T) {

@@ -979,7 +978,6 @@ func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *tes

 }

 func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *testing.T) {

-

 	s.d.StartWithBusybox(c, "--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024")

 	out, err := s.d.Cmd("run", "--ulimit", "nproc=2048", "--name=test", "busybox", "/bin/sh", "-c", "echo $(ulimit -n); echo $(ulimit -u)")

@@ -1992,7 +1990,6 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *testi

 	if out != "143" {

 		t.Fatalf("Expected exit code '%s' got '%s' for container '%s'\n", "143", out, cid)

 	}

-

 }

 // os.Kill should kill daemon ungracefully, leaving behind live containers.

@@ -117,7 +117,6 @@ func (s *DockerCLIEventSuite) TestEventsContainerEventsAttrSort(c *testing.T) {

 		if matches["eventType"] == "container" && matches["action"] == "create" {

 			matchedEvents++

 			assert.Check(c, strings.Contains(out, "(image=busybox, name=container-events-test)"), "Event attributes not sorted")

-

 		} else if matches["eventType"] == "container" && matches["action"] == "start" {

 			matchedEvents++

 			assert.Check(c, strings.Contains(out, "(image=busybox, name=container-events-test)"), "Event attributes not sorted")

@@ -391,7 +391,6 @@ func (s *DockerCLIEventSuite) TestEventsFilterNetworkID(c *testing.T) {

 }

 func (s *DockerDaemonSuite) TestDaemonEvents(c *testing.T) {

-

 	// daemon config file

 	configFilePath := "test.json"

 	defer os.Remove(configFilePath)

@@ -439,7 +438,6 @@ func (s *DockerDaemonSuite) TestDaemonEvents(c *testing.T) {

 }

 func (s *DockerDaemonSuite) TestDaemonEventsWithFilters(c *testing.T) {

-

 	// daemon config file

 	configFilePath := "test.json"

 	defer os.Remove(configFilePath)

@@ -76,7 +76,6 @@ func (s *DockerCLIExecSuite) TestExecInteractive(c *testing.T) {

 	case <-time.After(1 * time.Second):

 		c.Fatal("docker exec failed to exit on stdin close")

 	}

-

 }

 func (s *DockerCLIExecSuite) TestExecAfterContainerRestart(c *testing.T) {

@@ -152,7 +152,6 @@ func (s *DockerCLIHealthSuite) TestHealth(c *testing.T) {

 	out, _ = dockerCmd(c, "inspect",

 		"--format={{.Config.Healthcheck.Test}}", imageName)

 	assert.Equal(c, out, "[CMD cat /my status]\n")

-

 }

 // GitHub #33021

@@ -175,5 +174,4 @@ ENTRYPOINT /bin/sh -c "sleep 600"`))

 	// Start

 	dockerCmd(c, "start", name)

 	waitForHealthStatus(c, name, "starting", "healthy")

-

 }

@@ -65,7 +65,6 @@ LABEL label.Z="Z"`))

 		actualValue := actualValues[i]

 		assert.Assert(c, strings.Contains(actualValue, echoValue))

 	}

-

 }

 func (s *DockerCLIHistorySuite) TestHistoryExistentImage(c *testing.T) {

@@ -91,7 +91,6 @@ func (s *DockerCLIInspectSuite) TestInspectStatus(c *testing.T) {

 	dockerCmd(c, "stop", out)

 	inspectOut = inspectField(c, out, "State.Status")

 	assert.Equal(c, inspectOut, "exited")

-

 }

 func (s *DockerCLIInspectSuite) TestInspectTypeFlagContainer(c *testing.T) {

@@ -148,7 +147,7 @@ func (s *DockerCLIInspectSuite) TestInspectImageFilterInt(c *testing.T) {

 	size, err := strconv.Atoi(out)

 	assert.Assert(c, err == nil, "failed to inspect size of the image: %s, %v", out, err)

-	//now see if the size turns out to be the same

+	// now see if the size turns out to be the same

 	formatStr := fmt.Sprintf("--format={{eq .Size %d}}", size)

 	out, _ = dockerCmd(c, "inspect", formatStr, imageTest)

 	result, err := strconv.ParseBool(strings.TrimSuffix(out, "\n"))

@@ -170,7 +169,7 @@ func (s *DockerCLIInspectSuite) TestInspectContainerFilterInt(c *testing.T) {

 	exitCode, err := strconv.Atoi(out)

 	assert.Assert(c, err == nil, "failed to inspect exitcode of the container: %s, %v", out, err)

-	//now get the exit code to verify

+	// now get the exit code to verify

 	formatStr := fmt.Sprintf("--format={{eq .State.ExitCode %d}}", exitCode)

 	out, _ = dockerCmd(c, "inspect", formatStr, id)

 	inspectResult, err := strconv.ParseBool(strings.TrimSuffix(out, "\n"))

@@ -100,7 +100,6 @@ func (s *DockerCLILinksSuite) TestLinksPingLinkedContainersAfterRename(c *testin

 	dockerCmd(c, "run", "--rm", "--link", "container_new:alias1", "--link", "container2:alias2", "busybox", "sh", "-c", "ping -c 1 alias1 -W 1 && ping -c 1 alias2 -W 1")

 	dockerCmd(c, "kill", idA)

 	dockerCmd(c, "kill", idB)

-

 }

 func (s *DockerCLILinksSuite) TestLinksInspectLinksStarted(c *testing.T) {

@@ -147,7 +146,6 @@ func (s *DockerCLILinksSuite) TestLinksNotStartedParentNotFail(c *testing.T) {

 	dockerCmd(c, "create", "--name=first", "busybox", "top")

 	dockerCmd(c, "create", "--name=second", "--link=first:first", "busybox", "top")

 	dockerCmd(c, "start", "first")

-

 }

 func (s *DockerCLILinksSuite) TestLinksHostsFilesInject(c *testing.T) {

@@ -56,7 +56,6 @@ func (s *DockerNetworkSuite) SetUpSuite(c *testing.T) {

 }

 func setupRemoteNetworkDrivers(c *testing.T, mux *http.ServeMux, url, netDrv, ipamDrv string) {

-

 	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {

 		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")

 		fmt.Fprintf(w, `{"Implements": ["%s", "%s"]}`, driverapi.NetworkPluginEndpointType, ipamapi.PluginEndpointType)

@@ -759,7 +758,6 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *testing.T) {

 	assert.Equal(c, opts["opt2"], "drv2")

 	dockerCmd(c, "network", "rm", "testopt")

 	assertNwNotAvailable(c, "testopt")

-

 }

 func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *testing.T) {

@@ -782,7 +780,6 @@ func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *testing.T) {

 	assertNwIsAvailable(c, "v2net")

 	dockerCmd(c, "network", "rm", "v2net")

 	assertNwNotAvailable(c, "v2net")

-

 }

 func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *testing.T) {

@@ -38,7 +38,6 @@ func pruneNetworkAndVerify(c *testing.T, d *daemon.Daemon, kept, pruned []string

 			assert.NilError(c, err)

 			return out, ""

 		}, checker.Contains(s)), poll.WithTimeout(defaultReconciliationTimeout))

-

 	}

 	for _, s := range pruned {

@@ -130,7 +130,6 @@ func (s *DockerCLIPsSuite) TestPsListContainersBase(c *testing.T) {

 	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-f", "before="+fourthID, "-n=1")

 	assert.Equal(c, assertContainerList(RemoveOutputForExistingElements(out, existingContainers), expected), true, fmt.Sprintf("SINCE filter, BEFORE filter, LIMIT: Container list is not in the correct order: \n%s", out))

-

 }

 func assertContainerList(out string, expected []string) bool {

@@ -602,7 +601,6 @@ func (s *DockerCLIPsSuite) TestPsImageIDAfterUpdate(c *testing.T) {

 		f := strings.Fields(line)

 		assert.Equal(c, f[1], originalImageID)

 	}

-

 }

 func (s *DockerCLIPsSuite) TestPsNotShowPortsOfStoppedContainer(c *testing.T) {

@@ -120,7 +120,6 @@ func (s *DockerHubPullSuite) TestPullNonExistingImage(c *testing.T) {

 			assert.Assert(c, !strings.Contains(record.out, "unauthorized"), `message should not contain "unauthorized"`)

 		}

 	}

-

 }

 // TestPullFromCentralRegistryImplicitRefParts pulls an image from the central registry and verifies

@@ -63,13 +63,11 @@ func (s *DockerCLIRmiSuite) TestRmiTag(c *testing.T) {

 	{

 		imagesAfter, _ := dockerCmd(c, "images", "-a")

 		assert.Equal(c, strings.Count(imagesAfter, "\n"), strings.Count(imagesBefore, "\n")+1, fmt.Sprintf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))

-

 	}

 	dockerCmd(c, "rmi", "utest:tag1")

 	{

 		imagesAfter, _ := dockerCmd(c, "images", "-a")

 		assert.Equal(c, strings.Count(imagesAfter, "\n"), strings.Count(imagesBefore, "\n"), fmt.Sprintf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))

-

 	}

 }

@@ -89,7 +89,6 @@ func (s *DockerCLIRunSuite) TestRunLookupGoogleDNS(c *testing.T) {

 	} else {

 		dockerCmd(c, "run", "busybox", "nslookup", "google.com")

 	}

-

 }

 // the exit code should be 0

@@ -355,7 +354,6 @@ func (s *DockerCLIRunSuite) TestRunWithDaemonFlags(c *testing.T) {

 // Regression test for #4979

 func (s *DockerCLIRunSuite) TestRunWithVolumesFromExited(c *testing.T) {

-

 	var (

 		out      string

 		exitCode int

@@ -137,5 +137,4 @@ func (s *DockerSwarmSuite) TestServiceHealthStart(c *testing.T) {

 		task = d.GetTask(c, task.ID)

 		return task.Status.State, ""

 	}, checker.Equals(swarm.TaskStateRunning)), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

@@ -615,7 +615,6 @@ const globalNetworkPlugin = "global-network-plugin"

 const globalIPAMPlugin = "global-ipam-plugin"

 func setupRemoteGlobalNetworkPlugin(c *testing.T, mux *http.ServeMux, url, netDrv, ipamDrv string) {

-

 	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {

 		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")

 		fmt.Fprintf(w, `{"Implements": ["%s", "%s"]}`, driverapi.NetworkPluginEndpointType, ipamapi.PluginEndpointType)

@@ -923,7 +922,6 @@ func (s *DockerSwarmSuite) TestSwarmServiceNetworkUpdate(c *testing.T) {

 	result.Assert(c, icmd.Success)

 	poll.WaitOn(c, pollCheck(c, d.CheckRunningTaskNetworks, checker.DeepEquals(map[string]int{barNetwork: 1, bazNetwork: 1})), poll.WithTimeout(defaultReconciliationTimeout))

-

 }

 func (s *DockerSwarmSuite) TestDNSConfig(c *testing.T) {

@@ -104,5 +104,4 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPluginV2(c *testing.T) {

 	assert.NilError(c, err)

 	poll.WaitOn(c, pollCheck(c, d1.CheckRunningTaskImages, checker.DeepEquals(map[string]int{image: 1})), poll.WithTimeout(defaultReconciliationTimeout))

-

 }