Skip to content

Commit

Permalink
fix server flag test and error handeling
Browse files Browse the repository at this point in the history
  • Loading branch information
ShohamBit committed Feb 5, 2025
1 parent 8506ecf commit c8a1060
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmd/traceectl/pkg/cmd/flags/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 22 additions & 7 deletions cmd/traceectl/pkg/cmd/flags/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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,
},
{
Expand All @@ -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)
}
}

0 comments on commit c8a1060

Please sign in to comment.