d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
77 lines
1.9 KiB
Go
77 lines
1.9 KiB
Go
package resolver_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
|
|
)
|
|
|
|
func TestCacheFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
var r resolver.Resolver = resolver.FakeResolver{
|
|
Err: expected,
|
|
}
|
|
cache := &resolver.CacheResolver{Resolver: r}
|
|
addrs, err := cache.LookupHost(context.Background(), "www.google.com")
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if addrs != nil {
|
|
t.Fatal("expected nil addrs here")
|
|
}
|
|
if cache.Get("www.google.com") != nil {
|
|
t.Fatal("expected empty cache here")
|
|
}
|
|
}
|
|
|
|
func TestCacheHitSuccess(t *testing.T) {
|
|
var r resolver.Resolver = resolver.FakeResolver{
|
|
Err: errors.New("mocked error"),
|
|
}
|
|
cache := &resolver.CacheResolver{Resolver: r}
|
|
cache.Set("dns.google.com", []string{"8.8.8.8"})
|
|
addrs, err := cache.LookupHost(context.Background(), "dns.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(addrs) != 1 || addrs[0] != "8.8.8.8" {
|
|
t.Fatal("not the result we expected")
|
|
}
|
|
}
|
|
|
|
func TestCacheMissSuccess(t *testing.T) {
|
|
var r resolver.Resolver = resolver.FakeResolver{
|
|
Result: []string{"8.8.8.8"},
|
|
}
|
|
cache := &resolver.CacheResolver{Resolver: r}
|
|
addrs, err := cache.LookupHost(context.Background(), "dns.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(addrs) != 1 || addrs[0] != "8.8.8.8" {
|
|
t.Fatal("not the result we expected")
|
|
}
|
|
if cache.Get("dns.google.com")[0] != "8.8.8.8" {
|
|
t.Fatal("expected full cache here")
|
|
}
|
|
}
|
|
|
|
func TestCacheReadonlySuccess(t *testing.T) {
|
|
var r resolver.Resolver = resolver.FakeResolver{
|
|
Result: []string{"8.8.8.8"},
|
|
}
|
|
cache := &resolver.CacheResolver{Resolver: r, ReadOnly: true}
|
|
addrs, err := cache.LookupHost(context.Background(), "dns.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(addrs) != 1 || addrs[0] != "8.8.8.8" {
|
|
t.Fatal("not the result we expected")
|
|
}
|
|
if cache.Get("dns.google.com") != nil {
|
|
t.Fatal("expected empty cache here")
|
|
}
|
|
}
|