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
70 lines
1.4 KiB
Go
70 lines
1.4 KiB
Go
package dash
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
type FakeDeps struct {
|
|
httpTransport http.RoundTripper
|
|
jsonMarshalErr error
|
|
jsonMarshalResult []byte
|
|
newHTTPRequestErr error
|
|
newHTTPRequestResult *http.Request
|
|
readAllErr error
|
|
readAllResult []byte
|
|
}
|
|
|
|
func (d FakeDeps) HTTPClient() *http.Client {
|
|
return &http.Client{Transport: d.httpTransport}
|
|
}
|
|
|
|
func (d FakeDeps) JSONMarshal(v interface{}) ([]byte, error) {
|
|
return d.jsonMarshalResult, d.jsonMarshalErr
|
|
}
|
|
|
|
func (d FakeDeps) Logger() model.Logger {
|
|
return log.Log
|
|
}
|
|
|
|
func (d FakeDeps) NewHTTPRequest(
|
|
method string, url string, body io.Reader) (*http.Request, error) {
|
|
return d.newHTTPRequestResult, d.newHTTPRequestErr
|
|
}
|
|
|
|
func (d FakeDeps) ReadAll(r io.Reader) ([]byte, error) {
|
|
return d.readAllResult, d.readAllErr
|
|
}
|
|
|
|
func (d FakeDeps) Scheme() string {
|
|
return "https"
|
|
}
|
|
|
|
func (d FakeDeps) UserAgent() string {
|
|
return "miniooni/0.1.0-dev"
|
|
}
|
|
|
|
type FakeHTTPTransport struct {
|
|
err error
|
|
resp *http.Response
|
|
}
|
|
|
|
func (txp FakeHTTPTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return txp.resp, txp.err
|
|
}
|
|
|
|
type FakeHTTPTransportStack struct {
|
|
all []FakeHTTPTransport
|
|
}
|
|
|
|
func (txp *FakeHTTPTransportStack) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
frame := txp.all[0]
|
|
txp.all = txp.all[1:]
|
|
return frame.RoundTrip(req)
|
|
}
|