updated NewNaiveChrootStrategy invocation in jailer tests

Signed-off-by: Philipp Mieden <[email protected]>

Author: dreadl0ck

example_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -224,7 +223,6 @@ func ExampleJailerConfig_enablingJailer() {
 
 	const id = "my-jailer-test"
 	const path = "/path/to/jailer-workspace"
-	pathToWorkspace := filepath.Join(path, "firecracker", id)
 	const kernelImagePath = "/path/to/kernel-image"
 
 	uid := 123
@@ -247,7 +245,7 @@ func ExampleJailerConfig_enablingJailer() {
 			ID:             id,
 			NumaNode:       firecracker.Int(0),
 			ChrootBaseDir:  path,
-			ChrootStrategy: firecracker.NewNaiveChrootStrategy(pathToWorkspace, kernelImagePath),
+			ChrootStrategy: firecracker.NewNaiveChrootStrategy(kernelImagePath),
 			ExecFile:       "/path/to/firecracker-binary",
 		},
 	}

jailer_test.go

@@ -22,7 +22,7 @@ func TestJailerBuilder(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(0),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 			},
 			expectedArgs: []string{
@@ -53,7 +53,7 @@ func TestJailerBuilder(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(0),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 				JailerBinary:   "imprisoner",
 			},
@@ -86,7 +86,7 @@ func TestJailerBuilder(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(1),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 				ChrootBaseDir:  "/tmp",
 				JailerBinary:   "/path/to/the/jailer",
@@ -166,7 +166,7 @@ func TestJail(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(0),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 			},
 			expectedArgs: []string{
@@ -202,7 +202,7 @@ func TestJail(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(0),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 				JailerBinary:   "imprisoner",
 			},
@@ -240,7 +240,7 @@ func TestJail(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(1),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 				ChrootBaseDir:  "/tmp",
 				JailerBinary:   "/path/to/the/jailer",
@@ -283,7 +283,7 @@ func TestJail(t *testing.T) {
 				UID:            Int(123),
 				GID:            Int(100),
 				NumaNode:       Int(0),
-				ChrootStrategy: NewNaiveChrootStrategy("path", "kernel-image-path"),
+				ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"),
 				ExecFile:       "/path/to/firecracker",
 			},
 			expectedArgs: []string{

machine_test.go

@@ -153,7 +153,6 @@ func TestJailerMicroVMExecution(t *testing.T) {
 	// short names and directory to prevent SUN_LEN error
 	id := "b"
 	jailerTestPath := tmpDir
-	jailerFullRootPath := filepath.Join(jailerTestPath, filepath.Base(getFirecrackerBinaryPath()), id)
 	os.MkdirAll(jailerTestPath, 0777)
 
 	socketPath := "TestJailerMicroVMExecution.socket"
@@ -207,7 +206,7 @@ func TestJailerMicroVMExecution(t *testing.T) {
 			ID:             id,
 			ChrootBaseDir:  jailerTestPath,
 			ExecFile:       getFirecrackerBinaryPath(),
-			ChrootStrategy: NewNaiveChrootStrategy(jailerFullRootPath, vmlinuxPath),
+			ChrootStrategy: NewNaiveChrootStrategy(vmlinuxPath),
 			Stdout:         logFd,
 			Stderr:         logFd,
 		},