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
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/onsi/gomega v1.37.0
github.com/pborman/uuid v1.2.1
github.com/stretchr/testify v1.10.0
go.uber.org/goleak v1.3.0
golang.org/x/net v0.39.0
google.golang.org/grpc v1.72.0
google.golang.org/protobuf v1.36.6
Expand Down
2 changes: 1 addition & 1 deletion pkg/nfs/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ type TimeoutFunc func() (err error)
// WaitUntilTimeout waits for the exec function to complete or return timeout error
func WaitUntilTimeout(timeout time.Duration, execFunc ExecFunc, timeoutFunc TimeoutFunc) error {
// Create a channel to receive the result of the exec function
done := make(chan bool)
done := make(chan bool, 1)
var err error

// Start the exec function in a goroutine
Expand Down
10 changes: 8 additions & 2 deletions pkg/nfs/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"strings"
"testing"
"time"

"go.uber.org/goleak"
)

var (
Expand Down Expand Up @@ -449,6 +451,7 @@ func TestRemoveEmptyDirs(t *testing.T) {
}

func TestWaitUntilTimeout(t *testing.T) {
defer goleak.VerifyNone(t)
tests := []struct {
desc string
timeout time.Duration
Expand Down Expand Up @@ -494,8 +497,11 @@ func TestWaitUntilTimeout(t *testing.T) {

for _, test := range tests {
err := WaitUntilTimeout(test.timeout, test.execFunc, test.timeoutFunc)
if err != nil && (err.Error() != test.expectedErr.Error()) {
t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
if err != nil {
time.Sleep(2 * time.Second)
if err.Error() != test.expectedErr.Error() {
t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
}
}
}
}
5 changes: 5 additions & 0 deletions vendor/go.uber.org/goleak/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions vendor/go.uber.org/goleak/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions vendor/go.uber.org/goleak/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/go.uber.org/goleak/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions vendor/go.uber.org/goleak/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions vendor/go.uber.org/goleak/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/go.uber.org/goleak/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/go.uber.org/goleak/internal/stack/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading