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
		
			
				
	
	
		
			52 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			52 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package httptransport_test
 | |
| 
 | |
| import (
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"testing"
 | |
| 
 | |
| 	"github.com/ooni/probe-cli/v3/internal/engine/netx/httptransport"
 | |
| )
 | |
| 
 | |
| func TestUserAgentWithDefault(t *testing.T) {
 | |
| 	txp := httptransport.UserAgentTransport{
 | |
| 		RoundTripper: httptransport.FakeTransport{
 | |
| 			Resp: &http.Response{StatusCode: 200},
 | |
| 		},
 | |
| 	}
 | |
| 	req := &http.Request{URL: &url.URL{
 | |
| 		Scheme: "https",
 | |
| 		Host:   "www.google.com",
 | |
| 		Path:   "/",
 | |
| 	}}
 | |
| 	req.Header = http.Header{}
 | |
| 	resp, err := txp.RoundTrip(req)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	if resp.Request.Header.Get("User-Agent") != "miniooni/0.1.0-dev" {
 | |
| 		t.Fatal("not the User-Agent we expected")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestUserAgentWithExplicitValue(t *testing.T) {
 | |
| 	txp := httptransport.UserAgentTransport{
 | |
| 		RoundTripper: httptransport.FakeTransport{
 | |
| 			Resp: &http.Response{StatusCode: 200},
 | |
| 		},
 | |
| 	}
 | |
| 	req := &http.Request{URL: &url.URL{
 | |
| 		Scheme: "https",
 | |
| 		Host:   "www.google.com",
 | |
| 		Path:   "/",
 | |
| 	}}
 | |
| 	req.Header = http.Header{"User-Agent": []string{"antani-client/0.1.1"}}
 | |
| 	resp, err := txp.RoundTrip(req)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	if resp.Request.Header.Get("User-Agent") != "antani-client/0.1.1" {
 | |
| 		t.Fatal("not the User-Agent we expected")
 | |
| 	}
 | |
| }
 |