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(netxlite): make sure we always use netxmocks (#399)

Browse source 
* refactor(netxlite): make sure we always use netmocks

While there, improve logging and make sure we test 100% of the
package with unit tests only. (We don't need to have integration
testing in this package because it's fairly simple/obvious.)

Part of https://github.com/ooni/probe/issues/1505

* further improve logs
This commit is contained in:
Simone Basso 2021-06-23 17:00:44 +02:00 • committed by GitHub
commit b8428b302f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 124 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

59
internal/netxlite/resolver_test.go
View file

@ -2,13 +2,16 @@ package netxlite
import (
"context"
"errors"
"net"
"testing"
"github.com/apex/log"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/netxmocks"
)
func TestResolverSystemLookupHost(t *testing.T) {
func TestResolverSystemNetworkAddress(t *testing.T) {
r := ResolverSystem{}
if r.Network() != "system" {
t.Fatal("invalid Network")
@ -16,6 +19,10 @@ func TestResolverSystemLookupHost(t *testing.T) {
if r.Address() != "" {
t.Fatal("invalid Address")
}
}
func TestResolverSystemWorksAsIntended(t *testing.T) {
r := ResolverSystem{}
addrs, err := r.LookupHost(context.Background(), "dns.google.com")
if err != nil {
t.Fatal(err)
@ -25,27 +32,55 @@ func TestResolverSystemLookupHost(t *testing.T) {
}
}
func TestResolverLoggerWithFailure(t *testing.T) {
func TestResolverLoggerWithSuccess(t *testing.T) {
expected := []string{"1.1.1.1"}
r := ResolverLogger{
Logger: log.Log,
Resolver: DefaultResolver,
Logger: log.Log,
Resolver: &netxmocks.Resolver{
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
return expected, nil
},
},
}
if r.Network() != "system" {
t.Fatal("invalid Network")
addrs, err := r.LookupHost(context.Background(), "dns.google")
if err != nil {
t.Fatal(err)
}
if r.Address() != "" {
t.Fatal("invalid Address")
if diff := cmp.Diff(expected, addrs); diff != "" {
t.Fatal(diff)
}
addrs, err := r.LookupHost(context.Background(), "nonexistent.antani")
if err == nil {
t.Fatal("expected an error here")
}
func TestResolverLoggerWithFailure(t *testing.T) {
expected := errors.New("mocked error")
r := ResolverLogger{
Logger: log.Log,
Resolver: &netxmocks.Resolver{
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
return nil, expected
},
},
}
addrs, err := r.LookupHost(context.Background(), "dns.google")
if !errors.Is(err, expected) {
t.Fatal("not the error we expected", err)
}
if addrs != nil {
t.Fatal("expected nil addr here")
}
}
func TestResolverLoggerDefaultNetworkAddress(t *testing.T) {
func TestResolverLoggerChildNetworkAddress(t *testing.T) {
r := &ResolverLogger{Logger: log.Log, Resolver: DefaultResolver}
if r.Network() != "system" {
t.Fatal("invalid Network")
}
if r.Address() != "" {
t.Fatal("invalid Address")
}
}
func TestResolverLoggerNoChildNetworkAddress(t *testing.T) {
r := &ResolverLogger{Logger: log.Log, Resolver: &net.Resolver{}}
if r.Network() != "logger" {
t.Fatal("invalid Network")