From ac5ec5e32faad68c3afa55ee5c75d76e91a79948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mauricio=20V=C3=A1squez?= Date: Fri, 23 Oct 2020 07:41:20 -0500 Subject: [PATCH] libcontainer/integration: fix unit test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a merge issue between 0aa0fae3932c ("Kill all processes in cgroup even if init process Wait fails") & 73d93eeb0192 ("libct/int: make newTemplateConfig argument a struct") that resulted in passing the wrong datatype to newTemplateConfig in TestPIDHostInitProcessWait. Signed-off-by: Mauricio Vásquez --- libcontainer/integration/exec_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go index ffb2bb81a..c583901d8 100644 --- a/libcontainer/integration/exec_test.go +++ b/libcontainer/integration/exec_test.go @@ -1661,7 +1661,7 @@ func TestPIDHostInitProcessWait(t *testing.T) { pidns := "/proc/1/ns/pid" // Run a container with two long-running processes. - config := newTemplateConfig(rootfs) + config := newTemplateConfig(&tParam{rootfs: rootfs}) config.Namespaces.Add(configs.NEWPID, pidns) container, err := newContainerWithName("test", config) ok(t, err)