diff --git a/cmd/traceectl/pkg/cmd/flags/server.go b/cmd/traceectl/pkg/cmd/flags/server.go index d5b11c7eff2e..f277449d6942 100644 --- a/cmd/traceectl/pkg/cmd/flags/server.go +++ b/cmd/traceectl/pkg/cmd/flags/server.go @@ -18,7 +18,7 @@ func PrepareServer(serverSlice string) (*client.Server, error) { return server, fmt.Errorf("server address cannot be empty") } if _, ok := os.Stat(address); ok != nil { - return server, fmt.Errorf("failed to get gRPC listening address (%s): %v", address, err) + return server, fmt.Errorf("failed to get gRPC listening address (%s): %v", address, ok) } if server, err = client.NewClient(address); err != nil { return server, err diff --git a/cmd/traceectl/pkg/cmd/flags/server_test.go b/cmd/traceectl/pkg/cmd/flags/server_test.go index 59d15685d17a..5cb79c6760d2 100644 --- a/cmd/traceectl/pkg/cmd/flags/server_test.go +++ b/cmd/traceectl/pkg/cmd/flags/server_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/aquasecurity/tracee/cmd/traceectl/pkg/client" + "github.com/aquasecurity/tracee/cmd/traceectl/test" "github.com/stretchr/testify/assert" ) @@ -19,8 +20,8 @@ func TestPrepareServer(t *testing.T) { }{ { name: "valid server address", - serverSlice: "/var/run/tracee.sock", - expectedServer: &client.Server{Addr: "/var/run/tracee.sock"}, + serverSlice: test.DefaultSocket, + expectedServer: &client.Server{Addr: test.DefaultSocket}, expectedError: nil, }, { @@ -36,15 +37,29 @@ func TestPrepareServer(t *testing.T) { expectedError: fmt.Errorf("server address cannot be empty"), }, } + + mockServer, err := test.SetupMockSocket() + if err != nil { + t.Fatal(err) + } for _, testcase := range testCases { t.Run(testcase.name, func(t *testing.T) { - t.Parallel() - server, err := PrepareServer(testcase.serverSlice) - if testcase.expectedError != nil || err != nil { - assert.ErrorContains(t, err, testcase.expectedError.Error()) + if testcase.expectedError != nil { + if assert.ErrorContains(t, err, testcase.expectedError.Error()) { + return + } + } + if err != nil { + t.Fatal(err) } - assert.Equal(t, testcase.expectedServer, server) + if assert.Equal(t, testcase.expectedServer, server) { + return + } + }) } + if err := mockServer.TeardownMockSocket(); err != nil { + t.Fatal(err) + } }