d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
90 lines
2.0 KiB
Go
90 lines
2.0 KiB
Go
package ndt7
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
func TestUploadSetWriteDeadlineFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
mgr := newUploadManager(
|
|
&mockableConnMock{
|
|
WriteDeadlineErr: expected,
|
|
},
|
|
defaultCallbackPerformance,
|
|
)
|
|
err := mgr.run(context.Background())
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|
|
|
|
func TestUploadNewMessageFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
mgr := newUploadManager(
|
|
&mockableConnMock{},
|
|
defaultCallbackPerformance,
|
|
)
|
|
mgr.newMessage = func(int) (*websocket.PreparedMessage, error) {
|
|
return nil, expected
|
|
}
|
|
err := mgr.run(context.Background())
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|
|
|
|
func TestUploadWritePreparedMessageFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
mgr := newUploadManager(
|
|
&mockableConnMock{
|
|
WritePreparedMessageErr: expected,
|
|
},
|
|
defaultCallbackPerformance,
|
|
)
|
|
err := mgr.run(context.Background())
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|
|
|
|
func TestUploadWritePreparedMessageSubsequentFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
mgr := newUploadManager(
|
|
&mockableConnMock{},
|
|
defaultCallbackPerformance,
|
|
)
|
|
var already bool
|
|
mgr.newMessage = func(int) (*websocket.PreparedMessage, error) {
|
|
if !already {
|
|
already = true
|
|
return new(websocket.PreparedMessage), nil
|
|
}
|
|
return nil, expected
|
|
}
|
|
err := mgr.run(context.Background())
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|
|
|
|
func TestUploadLoop(t *testing.T) {
|
|
mgr := newUploadManager(
|
|
&mockableConnMock{},
|
|
defaultCallbackPerformance,
|
|
)
|
|
mgr.newMessage = func(int) (*websocket.PreparedMessage, error) {
|
|
return new(websocket.PreparedMessage), nil
|
|
}
|
|
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
|
defer cancel()
|
|
err := mgr.run(ctx)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|