diff options
author | Sebastiaan van Stijn <github@gone.nl> | 2022-07-08 18:27:07 +0200 |
---|---|---|
committer | Sebastiaan van Stijn <github@gone.nl> | 2022-07-08 19:56:23 +0200 |
commit | 52c1a2fae8ffe3efc8b24ef53a702582131ebc57 (patch) | |
tree | 32566addcaabbe5a2d50e8039da88d8223d6ada9 /integration | |
parent | 6668801d4056cf2e59eff2b23620b9d8a4043734 (diff) | |
download | docker-52c1a2fae8ffe3efc8b24ef53a702582131ebc57.tar.gz |
gofmt GoDoc comments with go1.19
Older versions of Go don't format comments, so committing this as
a separate commit, so that we can already make these changes before
we upgrade to Go 1.19.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'integration')
-rw-r--r-- | integration/container/ipcmode_linux_test.go | 6 | ||||
-rw-r--r-- | integration/internal/container/exec.go | 4 | ||||
-rw-r--r-- | integration/service/create_test.go | 4 | ||||
-rw-r--r-- | integration/system/cgroupdriver_systemd_test.go | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/integration/container/ipcmode_linux_test.go b/integration/container/ipcmode_linux_test.go index 86b60e5f5b..49141ce58e 100644 --- a/integration/container/ipcmode_linux_test.go +++ b/integration/container/ipcmode_linux_test.go @@ -26,9 +26,9 @@ import ( // // The format of /proc/self/mountinfo is like: // -// 29 23 0:24 / /dev/shm rw,nosuid,nodev shared:4 - tmpfs tmpfs rw -// ^^^^\ -// - this is the minor:major we look for +// 29 23 0:24 / /dev/shm rw,nosuid,nodev shared:4 - tmpfs tmpfs rw +// ^^^^\ +// - this is the minor:major we look for func testIpcCheckDevExists(mm string) (bool, error) { f, err := os.Open("/proc/self/mountinfo") if err != nil { diff --git a/integration/internal/container/exec.go b/integration/internal/container/exec.go index 98e2a6c481..14e370e714 100644 --- a/integration/internal/container/exec.go +++ b/integration/internal/container/exec.go @@ -33,8 +33,8 @@ func (res *ExecResult) Combined() string { // Exec executes a command inside a container, returning the result // containing stdout, stderr, and exit code. Note: -// - this is a synchronous operation; -// - cmd stdin is closed. +// - this is a synchronous operation; +// - cmd stdin is closed. func Exec(ctx context.Context, cli client.APIClient, id string, cmd []string, ops ...func(*types.ExecConfig)) (ExecResult, error) { // prepare exec execConfig := types.ExecConfig{ diff --git a/integration/service/create_test.go b/integration/service/create_test.go index 8335f894b8..0cba172d7d 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -363,7 +363,7 @@ func TestCreateServiceConfigFileMode(t *testing.T) { // // To test this, we're going to create a service with the sysctl option // -// {"net.ipv4.ip_nonlocal_bind": "0"} +// {"net.ipv4.ip_nonlocal_bind": "0"} // // We'll get the service's tasks to get the container ID, and then we'll // inspect the container. If the output of the container inspect contains the @@ -458,7 +458,7 @@ func TestCreateServiceSysctls(t *testing.T) { // // To test this, we're going to create a service with the capabilities option // -// []string{"CAP_NET_RAW", "CAP_SYS_CHROOT"} +// []string{"CAP_NET_RAW", "CAP_SYS_CHROOT"} // // We'll get the service's tasks to get the container ID, and then we'll // inspect the container. If the output of the container inspect contains the diff --git a/integration/system/cgroupdriver_systemd_test.go b/integration/system/cgroupdriver_systemd_test.go index c1b998abae..4544edffc9 100644 --- a/integration/system/cgroupdriver_systemd_test.go +++ b/integration/system/cgroupdriver_systemd_test.go @@ -26,7 +26,7 @@ func hasSystemd() bool { // TestCgroupDriverSystemdMemoryLimit checks that container // memory limit can be set when using systemd cgroupdriver. -// https://github.com/moby/moby/issues/35123 +// https://github.com/moby/moby/issues/35123 func TestCgroupDriverSystemdMemoryLimit(t *testing.T) { skip.If(t, testEnv.DaemonInfo.OSType == "windows") skip.If(t, !hasSystemd()) |