Skip to content

Fix flakiness in TestHook #5256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rata merged 2 commits into from
Apr 22, 2026
Merged

Fix flakiness in TestHook #5256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
905958e
tests/int: show stderr if command failed part II
kolyshkin Apr 18, 2026
1d12f98
tests/int: fix TestHook flakiness
kolyshkin Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions libcontainer/integration/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,7 @@ func TestPassExtraFiles(t *testing.T) {
ExtraFiles: []*os.File{pipein1, pipein2},
Stdin: nil,
Stdout: &stdout,
Stderr: new(strings.Builder),
Init: true,
}
err = container.Run(&process)
Expand Down Expand Up @@ -1074,11 +1075,14 @@ func TestHook(t *testing.T) {
container, err := newContainer(t, config)
ok(t, err)

// e.g: 'ls /prestart ...'
var cmd strings.Builder
cmd.WriteString("ls ")
for _, hook := range hookFiles {
cmd.WriteString("/" + hook + " ")
// The poststart hook is racing with this ls command (run as the
// container init), so we don't check that hook worked here yet.
if hook != "poststart" {
cmd.WriteString("/" + hook + " ")
}
}

var stdout strings.Builder
Expand All @@ -1097,6 +1101,13 @@ func TestHook(t *testing.T) {
// Wait for process
waitProcess(&pconfig, t)

// Check that poststart hook worked.
f, err = os.Open(config.Rootfs + "/poststart")
if err != nil {
t.Fatalf("poststart hook failed: %s", err)
}
f.Close()

if err := container.Destroy(); err != nil {
t.Fatalf("container destroy %s", err)
}
Expand Down
1 change: 1 addition & 0 deletions libcontainer/integration/execin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ func TestExecinPassExtraFiles(t *testing.T) {
ExtraFiles: []*os.File{pipein1, pipein2},
Stdin: nil,
Stdout: &stdout,
Stderr: new(strings.Builder),
}
err = container.Run(inprocess)
ok(t, err)
Expand Down
Loading