update

Signed-off-by: jason yang <jasonyangshadow@gmail.com>
JasonYangShadow · Feb 21, 2024 · 218973d · 218973d
1 parent 4fd33ce
commit 218973d
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/e2e/actions/actions.go b/e2e/actions/actions.go
@@ -807,79 +807,79 @@ func (c actionTests) PersistentOverlay(t *testing.T) {
 	}{
 		{
 			name:     "overlay_create",
-			argv:     []string{"--overlay", "dir", c.env.ImagePath, "touch", "/dir_overlay"},
+			argv:     []string{"--overlay", dir, c.env.ImagePath, "touch", "/dir_overlay"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name:     "overlay_ext3_create",
-			argv:     []string{"--overlay", "ext3Img", c.env.ImagePath, "touch", "/ext3_overlay"},
+			argv:     []string{"--overlay", ext3Img, c.env.ImagePath, "touch", "/ext3_overlay"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name:     "overlay_multiple_create",
-			argv:     []string{"--overlay", "ext3Img", "--overlay", "squashfsImage" + ":ro", c.env.ImagePath, "touch", "/multiple_overlay_fs"},
+			argv:     []string{"--overlay", ext3Img, "--overlay", squashfsImage + ":ro", c.env.ImagePath, "touch", "/multiple_overlay_fs"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name:     "overlay_find",
-			argv:     []string{"--overlay", "dir", c.env.ImagePath, "test", "-f", "/dir_overlay"},
+			argv:     []string{"--overlay", dir, c.env.ImagePath, "test", "-f", "/dir_overlay"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name: "overlay_find_with_writable_fail",
-			argv: []string{"--overlay", "dir", "--writable", c.env.ImagePath, "true"},
+			argv: []string{"--overlay", dir, "--writable", c.env.ImagePath, "true"},
 			exit: 255,
 		},
 		{
 			name: "overlay_find_with_writable_tmpfs",
-			argv: []string{"--overlay", "dir:ro", "--writable-tmpfs", c.env.ImagePath, "test", "-f", "/dir_overlay"},
+			argv: []string{"--overlay", dir + ":ro", "--writable-tmpfs", c.env.ImagePath, "test", "-f", "/dir_overlay"},
 			exit: 0,
 		},
 		{
 			name: "overlay_find_with_writable_tmpfs_fail",
-			argv: []string{"--overlay", "dir", "--writable-tmpfs", c.env.ImagePath, "true"},
+			argv: []string{"--overlay", dir, "--writable-tmpfs", c.env.ImagePath, "true"},
 			exit: 255,
 		},
 		{
 			name:     "overlay_ext3_find",
-			argv:     []string{"--overlay", "ext3Img", c.env.ImagePath, "test", "-f", "/ext3_overlay"},
+			argv:     []string{"--overlay", ext3Img, c.env.ImagePath, "test", "-f", "/ext3_overlay"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name: "overlay_multiple_writable_fail",
-			argv: []string{"--overlay", "ext3Img", "--overlay", "ext3Img", c.env.ImagePath, "true"},
+			argv: []string{"--overlay", ext3Img, "--overlay", ext3Img, c.env.ImagePath, "true"},
 			exit: 255,
 		},
 		{
 			name: "overlay_squashFS_find",
-			argv: []string{"--overlay", "squashfsImage" + ":ro", c.env.ImagePath, "test", "-f", "/squash_marker"},
+			argv: []string{"--overlay", squashfsImage + ":ro", c.env.ImagePath, "test", "-f", "/squash_marker"},
 			exit: 0,
 		},
 		{
 			name: "overlay_squashFS_find_without_ro",
-			argv: []string{"--overlay", "squashfsImage", c.env.ImagePath, "test", "-f", "/squash_marker"},
+			argv: []string{"--overlay", squashfsImage, c.env.ImagePath, "test", "-f", "/squash_marker"},
 			exit: 0,
 		},
 		{
 			name:     "overlay_multiple_find_ext3",
-			argv:     []string{"--overlay", "ext3Img", "--overlay", "squashfsImage" + ":ro", c.env.ImagePath, "test", "-f", "/multiple_overlay_fs"},
+			argv:     []string{"--overlay", ext3Img, "--overlay", squashfsImage + ":ro", c.env.ImagePath, "test", "-f", "/multiple_overlay_fs"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name:     "overlay_multiple_find_squashfs",
-			argv:     []string{"--overlay", "ext3Img", "--overlay", "squashfsImage" + ":ro", c.env.ImagePath, "test", "-f", "/squash_marker"},
+			argv:     []string{"--overlay", ext3Img, "--overlay", squashfsImage + ":ro", c.env.ImagePath, "test", "-f", "/squash_marker"},
 			fakeroot: true,
 			exit:     0,
 		},
 		{
 			name:     "overlay_noroot",
-			argv:     []string{"--overlay", "dir", c.env.ImagePath, "true"},
+			argv:     []string{"--overlay", dir, c.env.ImagePath, "true"},
 			fakeroot: true,
 			exit:     0,
 		},
@@ -904,7 +904,7 @@ func (c actionTests) PersistentOverlay(t *testing.T) {
 		},
 		{
 			name: "centos 7 Embedded overlay partition in SIF",
-			argv: []string{"${CENTOS7_DIR}", "ps"},
+			argv: []string{centos7Image, "ps"},
 			exit: 0,
 		},
 	}