99ec7ffca9
Since https://github.com/ooni/probe-cli/pull/527, if an experiment returns an error, the corresponding measurement is not submitted since the semantics of returning an error is that something fundamental went wrong (e.g., we could not parse the input URL). This diff ensures that all experiments only return and error when something fundamental was wrong and return nil otherwise. Reference issue: https://github.com/ooni/probe/issues/1808.
71 lines
1.8 KiB
Go
71 lines
1.8 KiB
Go
package ndt7
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/gorilla/websocket"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
func TestDialDownloadWithCancelledContext(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // immediately halt
|
|
mgr := newDialManager("wss://hostname.fake", log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialDownload(ctx)
|
|
if err == nil || err.Error() != netxlite.FailureInterrupted {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|
|
|
|
func TestDialUploadWithCancelledContext(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // immediately halt
|
|
mgr := newDialManager("wss://hostname.fake", log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialUpload(ctx)
|
|
if err == nil || err.Error() != netxlite.FailureInterrupted {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|
|
|
|
func TestDialIncludesUserAgent(t *testing.T) {
|
|
do := func(testName string) {
|
|
var userAgent string
|
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
userAgent = r.UserAgent()
|
|
w.WriteHeader(500)
|
|
})
|
|
server := httptest.NewServer(handler)
|
|
defer server.Close()
|
|
url, err := url.Parse(server.URL)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
url.Scheme = "ws"
|
|
mgr := newDialManager(url.String(), log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialWithTestName(context.Background(), testName)
|
|
if !errors.Is(err, websocket.ErrBadHandshake) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
if userAgent != "miniooni/0.1.0-dev" {
|
|
t.Fatal("User-Agent not sent")
|
|
}
|
|
}
|
|
do("download")
|
|
do("upload")
|
|
}
|