1. docker
  2. Commit 562880b276edb9130eab6adaab27d8aeb41ec388
Browse code

Fix more goimports

```
daemon/logger/splunk/splunk_test.go:33: File is not `goimports`-ed (goimports)
envKey: "a",
envRegexKey: "^foo",
labelsKey: "b",
tagKey: "c",
integration/build/build_test.go:41: File is not `goimports`-ed (goimports)
rm: false,
forceRm: false,
integration/image/remove_unix_test.go:49: File is not `goimports`-ed (goimports)
Root: d.Root,
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/02/12 02:53:01
Showing 5 changed files
daemon/logger/splunk/splunk_test.go
History View file @ 562880b
... ... 
@@ -30,10 +30,10 @@ func TestValidateLogOpt(t *testing.T) {
30 30 
 		splunkVerifyConnectionKey:     "true",
31 31 
 		splunkGzipCompressionKey:      "true",
32 32 
 		splunkGzipCompressionLevelKey: "1",
33 
-		envKey:      "a",
34 
-		envRegexKey: "^foo",
35 
-		labelsKey:   "b",
36 
-		tagKey:      "c",
33 
+		envKey:                        "a",
34 
+		envRegexKey:                   "^foo",
35 
+		labelsKey:                     "b",
36 
+		tagKey:                        "c",
37 37 
 	})
38 38 
 	if err != nil {
39 39 
 		t.Fatal(err)
... ... 
@@ -251,9 +251,9 @@ func TestInlineFormatWithNonDefaultOptions(t *testing.T) {
251 251 
 			splunkIndexKey:           "myindex",
252 252 
 			splunkFormatKey:          splunkFormatInline,
253 253 
 			splunkGzipCompressionKey: "true",
254 
-			tagKey:      "{{.ImageName}}/{{.Name}}",
255 
-			labelsKey:   "a",
256 
-			envRegexKey: "^foo",
254 
+			tagKey:                   "{{.ImageName}}/{{.Name}}",
255 
+			labelsKey:                "a",
256 
+			envRegexKey:              "^foo",
257 257 
 		},
258 258 
 		ContainerID:        "containeriid",
259 259 
 		ContainerName:      "/container_name",
integration-cli/docker_cli_build_test.go
History View file @ 562880b
... ... 
@@ -657,7 +657,7 @@ func (s *DockerSuite) TestBuildCopyWildcard(c *testing.T) {
657 657 
 			"file2.txt":                     "test2",
658 658 
 			"dir/nested_file":               "nested file",
659 659 
 			"dir/nested_dir/nest_nest_file": "2 times nested",
660 
-			"dirt": "dirty",
660 
+			"dirt":                          "dirty",
661 661 
 		}))
662 662 
 	defer ctx.Close()
663 663
integration/build/build_test.go
History View file @ 562880b
... ... 
@@ -38,8 +38,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
38 38 
 			RUN exit 0
39 39 
 			RUN exit 0`,
40 40 
 			numberOfIntermediateContainers: 2,
41 
-			rm:      false,
42 
-			forceRm: false,
41 
+			rm:                             false,
42 
+			forceRm:                        false,
43 43 
 		},
44 44 
 		{
45 45 
 			name: "successful build with remove",
... ... 
@@ -47,8 +47,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
47 47 
 			RUN exit 0
48 48 
 			RUN exit 0`,
49 49 
 			numberOfIntermediateContainers: 0,
50 
-			rm:      true,
51 
-			forceRm: false,
50 
+			rm:                             true,
51 
+			forceRm:                        false,
52 52 
 		},
53 53 
 		{
54 54 
 			name: "successful build with remove and force remove",
... ... 
@@ -56,8 +56,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
56 56 
 			RUN exit 0
57 57 
 			RUN exit 0`,
58 58 
 			numberOfIntermediateContainers: 0,
59 
-			rm:      true,
60 
-			forceRm: true,
59 
+			rm:                             true,
60 
+			forceRm:                        true,
61 61 
 		},
62 62 
 		{
63 63 
 			name: "failed build with no removal",
... ... 
@@ -65,8 +65,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
65 65 
 			RUN exit 0
66 66 
 			RUN exit 1`,
67 67 
 			numberOfIntermediateContainers: 2,
68 
-			rm:      false,
69 
-			forceRm: false,
68 
+			rm:                             false,
69 
+			forceRm:                        false,
70 70 
 		},
71 71 
 		{
72 72 
 			name: "failed build with remove",
... ... 
@@ -74,8 +74,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
74 74 
 			RUN exit 0
75 75 
 			RUN exit 1`,
76 76 
 			numberOfIntermediateContainers: 1,
77 
-			rm:      true,
78 
-			forceRm: false,
77 
+			rm:                             true,
78 
+			forceRm:                        false,
79 79 
 		},
80 80 
 		{
81 81 
 			name: "failed build with remove and force remove",
... ... 
@@ -83,8 +83,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
83 83 
 			RUN exit 0
84 84 
 			RUN exit 1`,
85 85 
 			numberOfIntermediateContainers: 0,
86 
-			rm:      true,
87 
-			forceRm: true,
86 
+			rm:                             true,
87 
+			forceRm:                        true,
88 88 
 		},
89 89 
 	}
90 90
integration/image/remove_unix_test.go
History View file @ 562880b
... ... 
@@ -46,7 +46,7 @@ func TestRemoveImageGarbageCollector(t *testing.T) {
46 46
47 47 
 	layerStores := make(map[string]layer.Store)
48 48 
 	layerStores[runtime.GOOS], _ = layer.NewStoreFromOptions(layer.StoreOptions{
49 
-		Root: d.Root,
49 
+		Root:                      d.Root,
50 50 
 		MetadataStorePathTemplate: filepath.Join(d.RootDir(), "image", "%s", "layerdb"),
51 51 
 		GraphDriver:               d.StorageDriver(),
52 52 
 		GraphDriverOptions:        nil,
integration/service/jobs_test.go
History View file @ 562880b
... ... 
@@ -104,7 +104,7 @@ func TestUpdateReplicatedJob(t *testing.T) {
104 104 
 	id := swarm.CreateService(t, d,
105 105 
 		swarm.ServiceWithMode(swarmtypes.ServiceMode{
106 106 
 			ReplicatedJob: &swarmtypes.ReplicatedJob{
107 
-			// use the default, empty values.
107 
+				// use the default, empty values.
108 108 
 			},
109 109 
 		}),
110 110 
 		// run "true" so the task exits with 0