Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
sudo apt -qy install libseccomp-dev
- uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
with:
version: v2.13
version: v2.15
skip-cache: true
# Extra linters, only checking new code from a pull request to main.
- name: lint-extra
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/configs/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ func (c *Command) Run(s *specs.State) error {
return err
case <-timerCh:
_ = cmd.Process.Kill()
<-errC
<-errC //nolint:errcheck // Wait error is expected after Kill.
return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds())
}
}
5 changes: 4 additions & 1 deletion libcontainer/logs/logs_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ func TestLogForwardingStopsAfterClosingTheWriter(t *testing.T) {
// Do not use finish() here as we check done pipe ourselves.
l.w.Close()
select {
case <-l.done:
case err := <-l.done:
if err != nil {
t.Fatal(err)
}
case <-time.After(10 * time.Second):
t.Fatal("log forwarding did not stop after closing the pipe")
}
Expand Down
4 changes: 2 additions & 2 deletions notify_socket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ func expectBarrier(t *testing.T, conn *net.UnixConn, notifyHostChan <-chan error
case <-timer.C:
// this is the expected case
break
case <-notifyHostChan:
t.Fatal("runc has terminated before barrier was lifted")
case err := <-notifyHostChan:
t.Fatalf("runc has terminated before barrier was lifted (err: %v)", err)
}

// Lift the barrier
Expand Down
Loading