cleanup: doh.powerdns.org is not working anymore (#924)
While there, `.../internal/sessionresolver` => `.../sessionresolver` See https://github.com/ooni/probe/issues/2255
This commit is contained in:
parent
ec73ae20b4
commit
1153850aca
17 changed files with 3 additions and 23 deletions
|
|
@ -1,148 +0,0 @@
|
|||
package sessionresolver
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
||||
)
|
||||
|
||||
func TestReadStateNoKVStore(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
out, err := reso.readstate()
|
||||
if !errors.Is(err, ErrNilKVStore) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadStateNothingInKVStore(t *testing.T) {
|
||||
reso := &Resolver{KVStore: &kvstore.Memory{}}
|
||||
out, err := reso.readstate()
|
||||
if !errors.Is(err, kvstore.ErrNoSuchKey) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadStateDecodeError(t *testing.T) {
|
||||
errMocked := errors.New("mocked error")
|
||||
reso := &Resolver{
|
||||
KVStore: &kvstore.Memory{},
|
||||
jsonCodec: &jsonCodecMockable{DecodeErr: errMocked},
|
||||
}
|
||||
if err := reso.KVStore.Set(storekey, []byte(`[]`)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
out, err := reso.readstate()
|
||||
if !errors.Is(err, errMocked) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadStateAndPruneReadStateError(t *testing.T) {
|
||||
reso := &Resolver{KVStore: &kvstore.Memory{}}
|
||||
out, err := reso.readstateandprune()
|
||||
if !errors.Is(err, kvstore.ErrNoSuchKey) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadStateAndPruneWithUnsupportedEntries(t *testing.T) {
|
||||
reso := &Resolver{KVStore: &kvstore.Memory{}}
|
||||
var in []*resolverinfo
|
||||
in = append(in, &resolverinfo{})
|
||||
if err := reso.writestate(in); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
out, err := reso.readstateandprune()
|
||||
if !errors.Is(err, errNoEntries) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("expected nil here")
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadStateDefaultWithMissingEntries(t *testing.T) {
|
||||
reso := &Resolver{KVStore: &kvstore.Memory{}}
|
||||
// let us simulate that we have just one entry here
|
||||
existingURL := "https://dns.google/dns-query"
|
||||
existingScore := 0.88
|
||||
var in []*resolverinfo
|
||||
in = append(in, &resolverinfo{
|
||||
URL: existingURL,
|
||||
Score: existingScore,
|
||||
})
|
||||
if err := reso.writestate(in); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// let us seee what we read
|
||||
out := reso.readstatedefault()
|
||||
if len(out) < 1 {
|
||||
t.Fatal("expected non-empty output")
|
||||
}
|
||||
keys := make(map[string]bool)
|
||||
var found bool
|
||||
for _, e := range out {
|
||||
keys[e.URL] = true
|
||||
if e.URL == existingURL {
|
||||
if e.Score != existingScore {
|
||||
t.Fatal("the score is not what we expected")
|
||||
}
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("did not found the pre-loaded URL")
|
||||
}
|
||||
for k := range allbyurl {
|
||||
if _, found := keys[k]; !found {
|
||||
t.Fatal("missing key", k)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestWriteStateNoKVStore(t *testing.T) {
|
||||
reso := &Resolver{}
|
||||
existingURL := "https://dns.google/dns-query"
|
||||
existingScore := 0.88
|
||||
var in []*resolverinfo
|
||||
in = append(in, &resolverinfo{
|
||||
URL: existingURL,
|
||||
Score: existingScore,
|
||||
})
|
||||
if err := reso.writestate(in); !errors.Is(err, ErrNilKVStore) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWriteStateCannotSerialize(t *testing.T) {
|
||||
errMocked := errors.New("mocked error")
|
||||
reso := &Resolver{
|
||||
jsonCodec: &jsonCodecMockable{
|
||||
EncodeErr: errMocked,
|
||||
},
|
||||
KVStore: &kvstore.Memory{},
|
||||
}
|
||||
existingURL := "https://dns.google/dns-query"
|
||||
existingScore := 0.88
|
||||
var in []*resolverinfo
|
||||
in = append(in, &resolverinfo{
|
||||
URL: existingURL,
|
||||
Score: existingScore,
|
||||
})
|
||||
if err := reso.writestate(in); !errors.Is(err, errMocked) {
|
||||
t.Fatal("not the error we expected", err)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue