kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

integration: fix empty-lines (revive)

Browse source 
integration/config/config_test.go:106:31: empty-lines: extra empty line at the end of a block (revive)
    integration/secret/secret_test.go:106:31: empty-lines: extra empty line at the end of a block (revive)
    integration/network/service_test.go:58:50: empty-lines: extra empty line at the end of a block (revive)
    integration/network/service_test.go:401:58: empty-lines: extra empty line at the end of a block (revive)
    integration/system/event_test.go:30:38: empty-lines: extra empty line at the end of a block (revive)
    integration/plugin/logging/read_test.go:19:41: empty-lines: extra empty line at the end of a block (revive)
    integration/service/list_test.go:30:48: empty-lines: extra empty line at the end of a block (revive)
    integration/service/create_test.go:400:46: empty-lines: extra empty line at the start of a block (revive)
    integration/container/logs_test.go:156:42: empty-lines: extra empty line at the end of a block (revive)
    integration/container/daemon_linux_test.go:135:44: empty-lines: extra empty line at the end of a block (revive)
    integration/container/restart_test.go:160:62: empty-lines: extra empty line at the end of a block (revive)
    integration/container/wait_test.go:181:47: empty-lines: extra empty line at the end of a block (revive)
    integration/container/restart_test.go:116:30: empty-lines: extra empty line at the end of a block (revive)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 786e6d80ba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-09-23 22:24:46 +02:00
parent 9d44956d8c
commit 31a938c73c
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
12 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration/config/config_test.go
View file

@ -109,7 +109,6 @@ func TestConfigList(t *testing.T) {
}) })
assert.NilError(t, err) assert.NilError(t, err)
assert.Check(t, is.DeepEqual(configNamesFromList(entries), tc.expected)) assert.Check(t, is.DeepEqual(configNamesFromList(entries), tc.expected))
} }
} }

1
integration/container/daemon_linux_test.go
View file

@ -169,7 +169,6 @@ func TestDaemonHostGatewayIP(t *testing.T) {
assert.Check(t, is.Contains(res.Stdout(), "6.7.8.9")) assert.Check(t, is.Contains(res.Stdout(), "6.7.8.9"))
c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true}) c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})
d.Stop(t) d.Stop(t)
} }
// TestRestartDaemonWithRestartingContainer simulates a case where a container is in "restarting" state when // TestRestartDaemonWithRestartingContainer simulates a case where a container is in "restarting" state when

1
integration/container/logs_test.go
View file

@ -170,7 +170,6 @@ func testLogs(t *testing.T, logDriver string) {
} }
return return
} }
} }
assert.DeepEqual(t, stdoutStr, tC.expectedOut) assert.DeepEqual(t, stdoutStr, tC.expectedOut)

2
integration/container/restart_test.go
View file

@ -122,7 +122,6 @@ func TestDaemonRestartKillContainers(t *testing.T) {
break break
} }
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
assert.Equal(t, expected, running, "got unexpected running state, expected %v, got: %v", expected, running) assert.Equal(t, expected, running, "got unexpected running state, expected %v, got: %v", expected, running)
@ -209,5 +208,4 @@ func TestContainerWithAutoRemoveCanBeRestarted(t *testing.T) {
poll.WaitOn(t, testContainer.IsRemoved(ctx, cli, cID)) poll.WaitOn(t, testContainer.IsRemoved(ctx, cli, cID))
}) })
} }
} }

1
integration/container/wait_test.go
View file

@ -221,5 +221,4 @@ func TestWaitRestartedContainer(t *testing.T) {
} }
}) })
} }
} }

1
integration/internal/requirement/requirement_linux.go
View file

@ -37,5 +37,4 @@ func Overlay2Supported(kernelVersion string) bool {
} }
requiredV := kernel.VersionInfo{Kernel: 4} requiredV := kernel.VersionInfo{Kernel: 4}
return kernel.CompareKernelVersion(*daemonV, requiredV) > -1 return kernel.CompareKernelVersion(*daemonV, requiredV) > -1
} }

2
integration/network/service_test.go
View file

@ -96,7 +96,6 @@ func TestDaemonDefaultNetworkPools(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
assert.Equal(t, out.IPAM.Config[0].Subnet, "175.33.1.0/24") assert.Equal(t, out.IPAM.Config[0].Subnet, "175.33.1.0/24")
delInterface(t, defaultNetworkBridge) delInterface(t, defaultNetworkBridge)
} }
func TestDaemonRestartWithExistingNetwork(t *testing.T) { func TestDaemonRestartWithExistingNetwork(t *testing.T) {
@ -454,5 +453,4 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) {
assert.NilError(t, err) assert.NilError(t, err)
err = d.SwarmLeave(t, true) err = d.SwarmLeave(t, true)
assert.NilError(t, err) assert.NilError(t, err)
} }

1
integration/plugin/logging/read_test.go
View file

@ -88,5 +88,4 @@ func TestReadPluginNoRead(t *testing.T) {
assert.Assert(t, strings.TrimSpace(buf.String()) == "hello world", buf.Bytes()) assert.Assert(t, strings.TrimSpace(buf.String()) == "hello world", buf.Bytes())
}) })
} }
} }

1
integration/secret/secret_test.go
View file

@ -109,7 +109,6 @@ func TestSecretList(t *testing.T) {
}) })
assert.NilError(t, err) assert.NilError(t, err)
assert.Check(t, is.DeepEqual(secretNamesFromList(entries), tc.expected)) assert.Check(t, is.DeepEqual(secretNamesFromList(entries), tc.expected))
} }
} }

1
integration/service/create_test.go
View file

@ -398,7 +398,6 @@ func TestCreateServiceSysctls(t *testing.T) {
// net.ipv4.ip_nonlocal_bind is, we can verify that setting the sysctl // net.ipv4.ip_nonlocal_bind is, we can verify that setting the sysctl
// options works // options works
for _, expected := range []string{"0", "1"} { for _, expected := range []string{"0", "1"} {
// store the map we're going to be using everywhere. // store the map we're going to be using everywhere.
expectedSysctls := map[string]string{"net.ipv4.ip_nonlocal_bind": expected} expectedSysctls := map[string]string{"net.ipv4.ip_nonlocal_bind": expected}

1
integration/service/list_test.go
View file

@ -104,5 +104,4 @@ func TestServiceListWithStatuses(t *testing.T) {
assert.Check(t, is.Equal(service.ServiceStatus.DesiredTasks, replicas)) assert.Check(t, is.Equal(service.ServiceStatus.DesiredTasks, replicas))
assert.Check(t, is.Equal(service.ServiceStatus.RunningTasks, replicas)) assert.Check(t, is.Equal(service.ServiceStatus.RunningTasks, replicas))
} }
} }

1
integration/system/event_test.go
View file

@ -71,7 +71,6 @@ func TestEventsExecDie(t *testing.T) {
case <-time.After(time.Second * 3): case <-time.After(time.Second * 3):
t.Fatal("timeout hit") t.Fatal("timeout hit")
} }
} }
// Test case for #18888: Events messages have been switched from generic // Test case for #18888: Events messages have been switched from generic