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.

Sign up for GitHub

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

feat(qa): process the errClass field #5

Merged
merged 4 commits into from
Nov 29, 2024
Merged

feat(qa): process the errClass field #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d78628
feat(qa): process the errClass field
bassosimone Nov 29, 2024
a9153be
x
bassosimone Nov 29, 2024
fd054eb
x
bassosimone Nov 29, 2024
d309f3a
x
bassosimone Nov 29, 2024
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/miekg/dns v1.1.62
github.com/rbmk-project/common v0.4.0
github.com/rbmk-project/dnscore v0.6.0
github.com/rbmk-project/x v0.0.0-20241129091418-83d898f771ef
github.com/rbmk-project/x v0.0.0-20241129115026-1ae0b6afd0db
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/rbmk-project/common v0.4.0 h1:gw7f/YdPxcUZ81cO9IMzEPDhsc6tOUte1m0OFi6
github.com/rbmk-project/common v0.4.0/go.mod h1:uzrFIJl8SEOpgS2pSeBFLUgqc4D1lIcGk/EYuxkFO0U=
github.com/rbmk-project/dnscore v0.6.0 h1:23rRsLBwTkQqJQMVPf4kimzGSZsw29EY7u3ffHbWkKg=
github.com/rbmk-project/dnscore v0.6.0/go.mod h1:Ct9RhR8HTI6tnq6/HSbzB/F8bk3k7E/6hmEctxSecUQ=
github.com/rbmk-project/x v0.0.0-20241129091418-83d898f771ef h1:4+h9APkbuAP1d1PMQ4K279Rpe+J5XRHKf+3z85RHE9o=
github.com/rbmk-project/x v0.0.0-20241129091418-83d898f771ef/go.mod h1:1Du1EHDkRs9D7MmpLPKAuBzZuJXRbvpBbefW0bTBVbs=
github.com/rbmk-project/x v0.0.0-20241129115026-1ae0b6afd0db h1:5w5kA2sSKIM0fQiALZG5TbP2C0Y6PKQFWSDxkm3QHfw=
github.com/rbmk-project/x v0.0.0-20241129115026-1ae0b6afd0db/go.mod h1:1Du1EHDkRs9D7MmpLPKAuBzZuJXRbvpBbefW0bTBVbs=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
Expand Down
20 changes: 18 additions & 2 deletions internal/qa/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,13 @@ type Event struct {
// Failure
//

// Err is the Go error that occurred.
// Err is the Go error that occurred or "" on success.
Err string `json:"err,omitempty"`

// ErrClass is the error classification to a fixed set
// of enumerated strings or "" on success.
ErrClass string `json:"errClass,omitempty"`

//
// I/O operations
//
Expand Down Expand Up @@ -159,6 +163,7 @@ func (ev *Event) VerifyReadWriteClose(t Driver) {
ev.verifyEndpoint(t, ev.LocalAddr)
ev.verifyEndpoint(t, ev.RemoteAddr)
ev.verifyErrEmpty(t)
ev.verifyErrClassEmpty(t)
ev.verifyIOBufferSizePositive(t)
ev.verifyIOBytesCountZero(t)

Expand All @@ -168,6 +173,7 @@ func (ev *Event) VerifyReadWriteClose(t Driver) {
ev.verifyEndpoint(t, ev.LocalAddr)
ev.verifyEndpoint(t, ev.RemoteAddr)
ev.verifyErrEmpty(t)
ev.verifyErrClassEmpty(t)
ev.verifyIOBufferSizeZero(t)
ev.verifyIOBytesCountZero(t)

Expand All @@ -178,13 +184,15 @@ func (ev *Event) VerifyReadWriteClose(t Driver) {
ev.verifyEndpoint(t, ev.RemoteAddr)
ev.verifyIOBufferSizeZero(t)
ev.verifyIOBytesCountOrErr(t)
ev.verifyIOBytesCountOrErrClass(t)

case "closeDone":
ev.verifyDoneEventTime(t)
ev.verifyProtocol(t)
ev.verifyEndpoint(t, ev.LocalAddr)
ev.verifyEndpoint(t, ev.RemoteAddr)
// any value of error is okay
// any value of err is okay
// any value of errClass is okay
ev.verifyIOBufferSizeZero(t)
ev.verifyIOBytesCountZero(t)

Expand Down Expand Up @@ -236,6 +244,10 @@ func (ev *Event) verifyErrEmpty(t Driver) {
require.Empty(t, ev.Err, "expected empty error field")
}

func (ev *Event) verifyErrClassEmpty(t Driver) {
require.Empty(t, ev.ErrClass, "expected empty errClass field")
}

func (ev *Event) verifyIOBufferSizePositive(t Driver) {
require.True(t, ev.IOBufferSize > 0, "expected positive ioBufferSize field")
}
Expand All @@ -252,6 +264,10 @@ func (ev *Event) verifyIOBytesCountOrErr(t Driver) {
require.True(t, ev.IOBytesCount > 0 || ev.Err != "", "expected ioBytesCount > 0 or err != \"\"")
}

func (ev *Event) verifyIOBytesCountOrErrClass(t Driver) {
require.True(t, ev.IOBytesCount > 0 || ev.ErrClass != "", "expected ioBytesCount > 0 or errClass != \"\"")
}

func (ev *Event) verifyDNSRawQueryEmpty(t Driver) {
require.Empty(t, ev.DNSRawQuery, "expected empty dnsRawQuery field")
}
Expand Down