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
58 lines
1.4 KiB
Go
58 lines
1.4 KiB
Go
package oldhttptransport
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/transactionid"
|
|
)
|
|
|
|
type transactionerCheckTransactionID struct {
|
|
roundTripper http.RoundTripper
|
|
t *testing.T
|
|
}
|
|
|
|
func (t *transactionerCheckTransactionID) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
ctx := req.Context()
|
|
if id := transactionid.ContextTransactionID(ctx); id == 0 {
|
|
t.t.Fatal("transaction ID not set")
|
|
}
|
|
return t.roundTripper.RoundTrip(req)
|
|
}
|
|
|
|
func TestTransactionerSuccess(t *testing.T) {
|
|
client := &http.Client{
|
|
Transport: NewTransactioner(&transactionerCheckTransactionID{
|
|
roundTripper: http.DefaultTransport,
|
|
t: t,
|
|
}),
|
|
}
|
|
resp, err := client.Get("https://www.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer resp.Body.Close()
|
|
_, err = ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
client.CloseIdleConnections()
|
|
}
|
|
|
|
func TestTransactionerFailure(t *testing.T) {
|
|
client := &http.Client{
|
|
Transport: NewTransactioner(http.DefaultTransport),
|
|
}
|
|
// This fails the request because we attempt to speak cleartext HTTP with
|
|
// a server that instead is expecting TLS.
|
|
resp, err := client.Get("http://www.google.com:443")
|
|
if err == nil {
|
|
t.Fatal("expected an error here")
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected a nil response here")
|
|
}
|
|
client.CloseIdleConnections()
|
|
}
|