c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(measurexlite): make buffered channels private (#864)

Browse source 
Closes https://github.com/ooni/probe/issues/2215
This commit is contained in:
DecFox 2022-08-17 23:40:48 +05:30 • committed by GitHub
commit e1d014e826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 326 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

51
internal/measurexlite/conn_test.go
View file

@ -117,7 +117,7 @@ func TestWrapNetConn(t *testing.T) {
}
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
trace.NetworkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
trace.networkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
conn := trace.WrapNetConn(underlying)
const bufsiz = 128
buffer := make([]byte, bufsiz)
@ -201,7 +201,7 @@ func TestWrapNetConn(t *testing.T) {
}
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
trace.NetworkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
trace.networkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
conn := trace.WrapNetConn(underlying)
const bufsiz = 128
buffer := make([]byte, bufsiz)
@ -292,7 +292,7 @@ func TestWrapUDPLikeConn(t *testing.T) {
}
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
trace.NetworkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
trace.networkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
conn := trace.WrapUDPLikeConn(underlying)
const bufsiz = 128
buffer := make([]byte, bufsiz)
@ -364,7 +364,7 @@ func TestWrapUDPLikeConn(t *testing.T) {
}
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
trace.NetworkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
trace.networkEvent = make(chan *model.ArchivalNetworkEvent) // no buffer
conn := trace.WrapUDPLikeConn(underlying)
const bufsiz = 128
buffer := make([]byte, bufsiz)
@ -387,6 +387,49 @@ func TestWrapUDPLikeConn(t *testing.T) {
})
}
func TestFirstNetworkEvent(t *testing.T) {
t.Run("returns nil when buffer is empty", func(t *testing.T) {
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
got := trace.FirstNetworkEventOrNil()
if got != nil {
t.Fatal("expected nil event")
}
})
t.Run("return first non-nil network event", func(t *testing.T) {
filler := func(tx *Trace, events []*model.ArchivalNetworkEvent) {
for _, ev := range events {
tx.networkEvent <- ev
}
}
zeroTime := time.Now()
trace := NewTrace(0, zeroTime)
expect := []*model.ArchivalNetworkEvent{{
Address: "1.1.1.1:443",
Failure: nil,
NumBytes: 0,
Operation: "read_from",
Proto: "udp",
T: 1.0,
Tags: []string{},
}, {
Address: "1.1.1.1:443",
Failure: nil,
NumBytes: 0,
Operation: "write_to",
Proto: "udp",
T: 1.0,
Tags: []string{},
}}
filler(trace, expect)
got := trace.FirstNetworkEventOrNil()
if diff := cmp.Diff(got, expect[0]); diff != "" {
t.Fatal(diff)
}
})
}
func TestNewAnnotationArchivalNetworkEvent(t *testing.T) {
var (
index int64 = 3