Skip to content
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.

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

improve error handling in tests #97

Merged
merged 1 commit into from
Jan 14, 2023
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
4 changes: 2 additions & 2 deletions f_basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ func TestBasic(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalBasic(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Basic{}
err2 := unmarshalBasic(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_bpf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ func TestBpf(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalBpf(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Bpf{}
err2 := unmarshalBpf(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_cgroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ func TestCgroup(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalCgroup(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Cgroup{}
err2 := unmarshalCgroup(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_flow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ func TestFlow(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalFlow(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Flow{}
err2 := unmarshalFlow(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_flower_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func TestFlower(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalFlower(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
Expand All @@ -136,7 +136,7 @@ func TestFlower(t *testing.T) {
val := Flower{}
err2 := unmarshalFlower(newData, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_fw_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ func TestFw(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalFw(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Fw{}
err2 := unmarshalFw(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_matchall_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestMatchall(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalMatchall(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && errors.Is(err1, testcase.err1) {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
Expand All @@ -34,7 +34,7 @@ func TestMatchall(t *testing.T) {
val := Matchall{}
err2 := unmarshalMatchall(newData, &val)
if err2 != nil {
if testcase.err2 != nil && errors.Is(err2, testcase.err2) {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_route4_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ func TestRoute4(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalRoute4(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Route4{}
err2 := unmarshalRoute4(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_rsvp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ func TestRsvp(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalRsvp(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && testcase.err1.Error() == err1.Error() {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := Rsvp{}
err2 := unmarshalRsvp(data, &val)
if err2 != nil {
if testcase.err2 != nil && testcase.err2.Error() == err2.Error() {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_tcindex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ func TestTcIndex(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalTcIndex(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && errors.Is(err1, testcase.err1) {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
}
val := TcIndex{}
err2 := unmarshalTcIndex(data, &val)
if err2 != nil {
if testcase.err2 != nil && errors.Is(err2, testcase.err2) {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down
4 changes: 2 additions & 2 deletions f_u32_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestU32(t *testing.T) {
t.Run(name, func(t *testing.T) {
data, err1 := marshalU32(&testcase.val)
if err1 != nil {
if testcase.err1 != nil && errors.Is(err1, testcase.err1) {
if errors.Is(err1, testcase.err1) {
return
}
t.Fatalf("Unexpected error: %v", err1)
Expand All @@ -75,7 +75,7 @@ func TestU32(t *testing.T) {
val := U32{}
err2 := unmarshalU32(newData, &val)
if err2 != nil {
if testcase.err2 != nil && errors.Is(err2, testcase.err2) {
if errors.Is(err2, testcase.err2) {
return
}
t.Fatalf("Unexpected error: %v", err2)
Expand Down