06ee0e55a9
* refactor(netx/dialer): hide implementation complexity This follows the blueprint of `module.Config` and `nodule.New` described at https://github.com/ooni/probe/issues/1591. * fix: ndt7 bug where we were not using the right resolver * fix(legacy/netx): clarify irrelevant implementation change * fix: improve comments * fix(hhfm): do not use dialer.New b/c it breaks it Unclear to me why this is happening. Still, improve upon the previous situation by adding a timeout. It does not seem a priority to look into this issue now.
86 lines
2.2 KiB
Go
86 lines
2.2 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"io/ioutil"
|
|
"net"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/bytecounter"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/mockablex"
|
|
)
|
|
|
|
func dorequest(ctx context.Context, url string) error {
|
|
txp := http.DefaultTransport.(*http.Transport).Clone()
|
|
defer txp.CloseIdleConnections()
|
|
dialer := &byteCounterDialer{Dialer: new(net.Dialer)}
|
|
txp.DialContext = dialer.DialContext
|
|
client := &http.Client{Transport: txp}
|
|
req, err := http.NewRequestWithContext(ctx, "GET", "http://www.google.com", nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if _, err := io.Copy(ioutil.Discard, resp.Body); err != nil {
|
|
return err
|
|
}
|
|
return resp.Body.Close()
|
|
}
|
|
|
|
func TestByteCounterNormalUsage(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
sess := bytecounter.New()
|
|
ctx := context.Background()
|
|
ctx = WithSessionByteCounter(ctx, sess)
|
|
if err := dorequest(ctx, "http://www.google.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
exp := bytecounter.New()
|
|
ctx = WithExperimentByteCounter(ctx, exp)
|
|
if err := dorequest(ctx, "http://facebook.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if sess.Received.Load() <= exp.Received.Load() {
|
|
t.Fatal("session should have received more than experiment")
|
|
}
|
|
if sess.Sent.Load() <= exp.Sent.Load() {
|
|
t.Fatal("session should have sent more than experiment")
|
|
}
|
|
}
|
|
|
|
func TestByteCounterNoHandlers(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
ctx := context.Background()
|
|
if err := dorequest(ctx, "http://www.google.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := dorequest(ctx, "http://facebook.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestByteCounterConnectFailure(t *testing.T) {
|
|
dialer := &byteCounterDialer{Dialer: mockablex.Dialer{
|
|
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return nil, io.EOF
|
|
},
|
|
}}
|
|
conn, err := dialer.DialContext(context.Background(), "tcp", "www.google.com:80")
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|