2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
92 lines
2.3 KiB
Go
92 lines
2.3 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/bytecounter"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
)
|
|
|
|
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 := iox.CopyContext(ctx, io.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 exp.Received.Load() <= 0 {
|
|
t.Fatal("experiment should have received some bytes")
|
|
}
|
|
if sess.Received.Load() <= exp.Received.Load() {
|
|
t.Fatal("session should have received more than experiment")
|
|
}
|
|
if exp.Sent.Load() <= 0 {
|
|
t.Fatal("experiment should have sent some bytes")
|
|
}
|
|
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: &mocks.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")
|
|
}
|
|
}
|