Skip to content

Commit b5244a4

Browse files
committed
test: align helper expectations after rebase
1 parent cb748ba commit b5244a4

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

scripts/ci_cleanroom_e2e_behavior_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestCiCleanroomE2EVerifyHelperCapabilitiesDetectsMissingCapabilities(t *tes
5959

6060
annotationPath := filepath.Join(workDir, "annotation.md")
6161
helperPath := filepath.Join(workDir, "helper.sh")
62-
writeExecutable(t, helperPath, "#!/usr/bin/env bash\nprintf 'firecracker-network\\n'\n")
62+
writeExecutable(t, helperPath, "#!/usr/bin/env bash\nprintf 'firecracker-zfs\\n'\n")
6363
writeExecutable(t, filepath.Join(binDir, "sudo"), "#!/usr/bin/env bash\n[[ \"$1\" == \"-n\" ]] && shift\nexec \"$@\"\n")
6464
writeExecutable(t, filepath.Join(binDir, "buildkite-agent"), "#!/usr/bin/env bash\ncat >\"$ANNOTATION_FILE\"\n")
6565

@@ -83,7 +83,7 @@ fi
8383
if !strings.Contains(stderr, "missing required capabilities") {
8484
t.Fatalf("expected missing capabilities in stderr, got %q", stderr)
8585
}
86-
if !strings.Contains(stderr, "firecracker-rootfs") {
86+
if !strings.Contains(stderr, "firecracker-network") {
8787
t.Fatalf("expected missing capability name in stderr, got %q", stderr)
8888
}
8989

scripts/root_helper_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ func TestCleanroomRootHelperDeclaresCapabilitiesAndZFSSupport(t *testing.T) {
3737
"bin=\"$(zfs_bin)\"",
3838
"exec \"$bin\" \"$@\"",
3939
"exec \"$(dd_bin)\" \"$@\"",
40-
"*/dist/cleanroom-guest-agent-linux-*",
41-
"*/bin/cleanroom-guest-agent-linux-*",
42-
"*/libexec/cleanroom/cleanroom-guest-agent-linux-*",
43-
"install: source symlinks are unsupported",
4440
" zfs)",
4541
" dd)",
4642
} {

0 commit comments

Comments
 (0)