浏览代码

integration/internal/container: add WithPIDMode option

Some files used aliases, others didn't, and they didn't appear to be
required.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 年之前
父节点
当前提交
17571ff199
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 2 4
      integration/container/pidmode_linux_test.go
  2. 7 0
      integration/internal/container/ops.go

+ 2 - 4
integration/container/pidmode_linux_test.go

@@ -12,7 +12,7 @@ import (
 	"gotest.tools/v3/skip"
 	"gotest.tools/v3/skip"
 )
 )
 
 
-func TestPidHost(t *testing.T) {
+func TestPIDModeHost(t *testing.T) {
 	skip.If(t, testEnv.DaemonInfo.OSType != "linux")
 	skip.If(t, testEnv.DaemonInfo.OSType != "linux")
 	skip.If(t, testEnv.IsRemoteDaemon())
 	skip.If(t, testEnv.IsRemoteDaemon())
 
 
@@ -23,9 +23,7 @@ func TestPidHost(t *testing.T) {
 	apiClient := testEnv.APIClient()
 	apiClient := testEnv.APIClient()
 	ctx := context.Background()
 	ctx := context.Background()
 
 
-	cID := container.Run(ctx, t, apiClient, func(c *container.TestContainerConfig) {
-		c.HostConfig.PidMode = "host"
-	})
+	cID := container.Run(ctx, t, apiClient, container.WithPIDMode("host"))
 	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "running"), poll.WithDelay(100*time.Millisecond))
 	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "running"), poll.WithDelay(100*time.Millisecond))
 	cPid := container.GetContainerNS(ctx, t, apiClient, cID, "pid")
 	cPid := container.GetContainerNS(ctx, t, apiClient, cID, "pid")
 	assert.Assert(t, hostPid == cPid)
 	assert.Assert(t, hostPid == cPid)

+ 7 - 0
integration/internal/container/ops.go

@@ -273,3 +273,10 @@ func WithSecurityOpt(opt string) func(*TestContainerConfig) {
 		c.HostConfig.SecurityOpt = append(c.HostConfig.SecurityOpt, opt)
 		c.HostConfig.SecurityOpt = append(c.HostConfig.SecurityOpt, opt)
 	}
 	}
 }
 }
+
+// WithPIDMode sets the PID-mode for the container.
+func WithPIDMode(mode container.PidMode) func(c *TestContainerConfig) {
+	return func(c *TestContainerConfig) {
+		c.HostConfig.PidMode = mode
+	}
+}