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
40 lines
868 B
Go
40 lines
868 B
Go
package ndt7
|
|
|
|
import (
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
type mockableConnMock struct {
|
|
NextReaderMsgType int
|
|
NextReaderErr error
|
|
NextReaderReader func() io.Reader
|
|
ReadDeadlineErr error
|
|
WriteDeadlineErr error
|
|
WritePreparedMessageErr error
|
|
}
|
|
|
|
func (c *mockableConnMock) NextReader() (int, io.Reader, error) {
|
|
var reader io.Reader
|
|
if c.NextReaderReader != nil {
|
|
reader = c.NextReaderReader()
|
|
}
|
|
return c.NextReaderMsgType, reader, c.NextReaderErr
|
|
}
|
|
|
|
func (c *mockableConnMock) SetReadDeadline(time.Time) error {
|
|
return c.ReadDeadlineErr
|
|
}
|
|
|
|
func (c *mockableConnMock) SetReadLimit(int64) {}
|
|
|
|
func (c *mockableConnMock) SetWriteDeadline(time.Time) error {
|
|
return c.WriteDeadlineErr
|
|
}
|
|
|
|
func (c *mockableConnMock) WritePreparedMessage(*websocket.PreparedMessage) error {
|
|
return c.WritePreparedMessageErr
|
|
}
|