c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: merge dnsx and errorsx into netxlite (#517)

Browse source 
When preparing a tutorial for netxlite, I figured it is easier
to tell people "hey, this is the package you should use for all
low-level networking stuff" rather than introducing people to
a set of packages working together where some piece of functionality
is here and some other piece is there.

Part of https://github.com/ooni/probe/issues/1591
This commit is contained in:
Simone Basso 2021-09-28 12:42:01 +02:00 • committed by GitHub
commit 6d3a4f1db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
169 changed files with 575 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/netxlite/dialer_test.go
View file

@ -11,7 +11,6 @@ import (
"time"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/netxlite/errorsx"
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
)
@ -254,9 +253,9 @@ func TestDialerResolver(t *testing.T) {
mu := &sync.Mutex{}
errorsList := []error{
errors.New("a mocked error"),
errorsx.NewErrWrapper(
errorsx.ClassifyGenericError,
errorsx.CloseOperation,
NewErrWrapper(
ClassifyGenericError,
CloseOperation,
io.EOF,
),
}
@ -282,7 +281,7 @@ func TestDialerResolver(t *testing.T) {
},
}
conn, err := d.DialContext(context.Background(), "tcp", "dot.dns:853")
if err == nil || err.Error() != errorsx.FailureEOFError {
if err == nil || err.Error() != FailureEOFError {
t.Fatal("unexpected err", err)
}
if conn != nil {
@ -296,9 +295,9 @@ func TestDialerResolver(t *testing.T) {
mu := &sync.Mutex{}
errorsList := []error{
errors.New("a mocked error"),
errorsx.NewErrWrapper(
errorsx.ClassifyGenericError,
errorsx.CloseOperation,
NewErrWrapper(
ClassifyGenericError,
CloseOperation,
errors.New("antani"),
),
}
@ -529,7 +528,7 @@ func TestDialerErrWrapper(t *testing.T) {
}
ctx := context.Background()
conn, err := d.DialContext(ctx, "", "")
if err == nil || err.Error() != errorsx.FailureEOFError {
if err == nil || err.Error() != FailureEOFError {
t.Fatal("unexpected err", err)
}
if conn != nil {
@ -585,7 +584,7 @@ func TestDialerErrWrapperConn(t *testing.T) {
},
}
count, err := conn.Read(b)
if err == nil || err.Error() != errorsx.FailureEOFError {
if err == nil || err.Error() != FailureEOFError {
t.Fatal("unexpected err", err)
}
if count != 0 {
@ -624,7 +623,7 @@ func TestDialerErrWrapperConn(t *testing.T) {
},
}
count, err := conn.Write(b)
if err == nil || err.Error() != errorsx.FailureEOFError {
if err == nil || err.Error() != FailureEOFError {
t.Fatal("unexpected err", err)
}
if count != 0 {
@ -658,7 +657,7 @@ func TestDialerErrWrapperConn(t *testing.T) {
},
}
err := conn.Close()
if err == nil || err.Error() != errorsx.FailureEOFError {
if err == nil || err.Error() != FailureEOFError {
t.Fatal("unexpected err", err)
}
})