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(ndt7): use netxlite rather than netx (#768)

Browse source 
This diff required us to move some code around, but no major
change actually happened, except better tests.

While there, I also slightly refactored ndt7's implementation and
removed the ProxyURL setting, which was actually unused.

See https://github.com/ooni/probe/issues/2121
This commit is contained in:
Simone Basso 2022-05-30 23:14:07 +02:00 • committed by GitHub
commit 3265bc670a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 189 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/engine/experiment/ndt7/upload_test.go
View file

@ -12,7 +12,7 @@ import (
func TestUploadSetWriteDeadlineFailure(t *testing.T) {
expected := errors.New("mocked error")
mgr := newUploadManager(
&mockableConnMock{
&mockableWSConn{
WriteDeadlineErr: expected,
},
defaultCallbackPerformance,
@ -26,7 +26,7 @@ func TestUploadSetWriteDeadlineFailure(t *testing.T) {
func TestUploadNewMessageFailure(t *testing.T) {
expected := errors.New("mocked error")
mgr := newUploadManager(
&mockableConnMock{},
&mockableWSConn{},
defaultCallbackPerformance,
)
mgr.newMessage = func(int) (*websocket.PreparedMessage, error) {
@ -41,7 +41,7 @@ func TestUploadNewMessageFailure(t *testing.T) {
func TestUploadWritePreparedMessageFailure(t *testing.T) {
expected := errors.New("mocked error")
mgr := newUploadManager(
&mockableConnMock{
&mockableWSConn{
WritePreparedMessageErr: expected,
},
defaultCallbackPerformance,
@ -55,7 +55,7 @@ func TestUploadWritePreparedMessageFailure(t *testing.T) {
func TestUploadWritePreparedMessageSubsequentFailure(t *testing.T) {
expected := errors.New("mocked error")
mgr := newUploadManager(
&mockableConnMock{},
&mockableWSConn{},
defaultCallbackPerformance,
)
var already bool
@ -77,7 +77,7 @@ func TestUploadLoop(t *testing.T) {
t.Skip("skip test in short mode")
}
mgr := newUploadManager(
&mockableConnMock{},
&mockableWSConn{},
defaultCallbackPerformance,
)
mgr.newMessage = func(int) (*websocket.PreparedMessage, error) {