kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #40502 from thaJeztah/fix_goimports 

Fix more goimports
This commit is contained in:
Brian Goff 2020-02-11 12:43:54 -08:00 committed by GitHub
parent 10425ed4cb 562880b276
commit c51c65a217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/logger/splunk/splunk_test.go
View File

@ -30,10 +30,10 @@ func TestValidateLogOpt(t *testing.T) {
splunkVerifyConnectionKey: "true", splunkVerifyConnectionKey: "true",
splunkGzipCompressionKey: "true", splunkGzipCompressionKey: "true",
splunkGzipCompressionLevelKey: "1", splunkGzipCompressionLevelKey: "1",
envKey: "a", envKey: "a",
envRegexKey: "^foo", envRegexKey: "^foo",
labelsKey: "b", labelsKey: "b",
tagKey: "c", tagKey: "c",
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -251,9 +251,9 @@ func TestInlineFormatWithNonDefaultOptions(t *testing.T) {
splunkIndexKey: "myindex", splunkIndexKey: "myindex",
splunkFormatKey: splunkFormatInline, splunkFormatKey: splunkFormatInline,
splunkGzipCompressionKey: "true", splunkGzipCompressionKey: "true",
tagKey: "{{.ImageName}}/{{.Name}}", tagKey: "{{.ImageName}}/{{.Name}}",
labelsKey: "a", labelsKey: "a",
envRegexKey: "^foo", envRegexKey: "^foo",
}, },
ContainerID: "containeriid", ContainerID: "containeriid",
ContainerName: "/container_name", ContainerName: "/container_name",

2
integration-cli/docker_cli_build_test.go
View File

@ -657,7 +657,7 @@ func (s *DockerSuite) TestBuildCopyWildcard(c *testing.T) {
"file2.txt": "test2", "file2.txt": "test2",
"dir/nested_file": "nested file", "dir/nested_file": "nested file",
"dir/nested_dir/nest_nest_file": "2 times nested", "dir/nested_dir/nest_nest_file": "2 times nested",
"dirt": "dirty", "dirt": "dirty",
})) }))
defer ctx.Close() defer ctx.Close()

24
integration/build/build_test.go
View File

@ -38,8 +38,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 0`, RUN exit 0`,
numberOfIntermediateContainers: 2, numberOfIntermediateContainers: 2,
rm: false, rm: false,
forceRm: false, forceRm: false,
}, },
{ {
name: "successful build with remove", name: "successful build with remove",
@ -47,8 +47,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 0`, RUN exit 0`,
numberOfIntermediateContainers: 0, numberOfIntermediateContainers: 0,
rm: true, rm: true,
forceRm: false, forceRm: false,
}, },
{ {
name: "successful build with remove and force remove", name: "successful build with remove and force remove",
@ -56,8 +56,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 0`, RUN exit 0`,
numberOfIntermediateContainers: 0, numberOfIntermediateContainers: 0,
rm: true, rm: true,
forceRm: true, forceRm: true,
}, },
{ {
name: "failed build with no removal", name: "failed build with no removal",
@ -65,8 +65,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 1`, RUN exit 1`,
numberOfIntermediateContainers: 2, numberOfIntermediateContainers: 2,
rm: false, rm: false,
forceRm: false, forceRm: false,
}, },
{ {
name: "failed build with remove", name: "failed build with remove",
@ -74,8 +74,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 1`, RUN exit 1`,
numberOfIntermediateContainers: 1, numberOfIntermediateContainers: 1,
rm: true, rm: true,
forceRm: false, forceRm: false,
}, },
{ {
name: "failed build with remove and force remove", name: "failed build with remove and force remove",
@ -83,8 +83,8 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
RUN exit 0 RUN exit 0
RUN exit 1`, RUN exit 1`,
numberOfIntermediateContainers: 0, numberOfIntermediateContainers: 0,
rm: true, rm: true,
forceRm: true, forceRm: true,
}, },
} }

2
integration/image/remove_unix_test.go
View File

@ -46,7 +46,7 @@ func TestRemoveImageGarbageCollector(t *testing.T) {
layerStores := make(map[string]layer.Store) layerStores := make(map[string]layer.Store)
layerStores[runtime.GOOS], _ = layer.NewStoreFromOptions(layer.StoreOptions{ layerStores[runtime.GOOS], _ = layer.NewStoreFromOptions(layer.StoreOptions{
Root: d.Root, Root: d.Root,
MetadataStorePathTemplate: filepath.Join(d.RootDir(), "image", "%s", "layerdb"), MetadataStorePathTemplate: filepath.Join(d.RootDir(), "image", "%s", "layerdb"),
GraphDriver: d.StorageDriver(), GraphDriver: d.StorageDriver(),
GraphDriverOptions: nil, GraphDriverOptions: nil,

2
integration/service/jobs_test.go
View File

@ -104,7 +104,7 @@ func TestUpdateReplicatedJob(t *testing.T) {
id := swarm.CreateService(t, d, id := swarm.CreateService(t, d,
swarm.ServiceWithMode(swarmtypes.ServiceMode{ swarm.ServiceWithMode(swarmtypes.ServiceMode{
ReplicatedJob: &swarmtypes.ReplicatedJob{ ReplicatedJob: &swarmtypes.ReplicatedJob{
// use the default, empty values. // use the default, empty values.
}, },
}), }),
// run "true" so the task exits with 0 // run "true" so the task exits with 0