33de701263
* refactor(atomicx): move outside the engine package After merging probe-engine into probe-cli, my impression is that we have too much unnecessary nesting of packages in this repository. The idea of this commit and of a bunch of following commits will instead be to reduce the nesting and simplify the structure. While there, improve the documentation. * fix: always use the atomicx package For consistency, never use sync/atomic and always use ./internal/atomicx so we can just grep and make sure we're not risking to crash if we make a subtle mistake on a 32 bit platform. While there, mention in the contributing guidelines that we want to always prefer the ./internal/atomicx package over sync/atomic. * fix(atomicx): remove unnecessary constructor We don't need a constructor here. The default constructed `&Int64{}` instance is already usable and the constructor does not add anything to what we are doing, rather it just creates extra confusion. * cleanup(atomicx): we are not using Float64 Because atomicx.Float64 is unused, we can safely zap it. * cleanup(atomicx): simplify impl and improve tests We can simplify the implementation by using defer and by letting the Load() method call Add(0). We can improve tests by making many goroutines updated the atomic int64 value concurrently. * refactor(fsx): can live in the ./internal pkg Let us reduce the amount of nesting. While there, ensure that the package only exports the bare minimum, and improve the documentation of the tests, to ease reading the code. * refactor: move runtimex to ./internal * refactor: move shellx into the ./internal package While there, remove unnecessary dependency between packages. While there, specify in the contributing guidelines that one should use x/sys/execabs instead of os/exec. * refactor: move ooapi into the ./internal pkg * refactor(humanize): move to ./internal and better docs * refactor: move platform to ./internal * refactor(randx): move to ./internal * refactor(multierror): move into the ./internal pkg * refactor(kvstore): all kvstores in ./internal Rather than having part of the kvstore inside ./internal/engine/kvstore and part in ./internal/engine/kvstore.go, let us put every piece of code that is kvstore related into the ./internal/kvstore package. * fix(kvstore): always return ErrNoSuchKey on Get() error It should help to use the kvstore everywhere removing all the copies that are lingering around the tree. * sessionresolver: make KVStore mandatory Simplifies implementation. While there, use the ./internal/kvstore package rather than having our private implementation. * fix(ooapi): use the ./internal/kvstore package * fix(platform): better documentation
154 lines
3.6 KiB
Go
154 lines
3.6 KiB
Go
package probeservices_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
|
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
|
)
|
|
|
|
func TestStateAuth(t *testing.T) {
|
|
t.Run("with no Token", func(t *testing.T) {
|
|
state := probeservices.State{Expire: time.Now().Add(10 * time.Hour)}
|
|
if state.Auth() != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
})
|
|
t.Run("with expired Token", func(t *testing.T) {
|
|
state := probeservices.State{
|
|
Expire: time.Now().Add(-1 * time.Hour),
|
|
Token: "xx-x-xxx-xx",
|
|
}
|
|
if state.Auth() != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
})
|
|
t.Run("with good Token", func(t *testing.T) {
|
|
state := probeservices.State{
|
|
Expire: time.Now().Add(10 * time.Hour),
|
|
Token: "xx-x-xxx-xx",
|
|
}
|
|
if state.Auth() == nil {
|
|
t.Fatal("expected valid auth here")
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestStateCredentials(t *testing.T) {
|
|
t.Run("with no ClientID", func(t *testing.T) {
|
|
state := probeservices.State{}
|
|
if state.Credentials() != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
})
|
|
t.Run("with no Password", func(t *testing.T) {
|
|
state := probeservices.State{
|
|
ClientID: "xx-x-xxx-xx",
|
|
}
|
|
if state.Credentials() != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
})
|
|
t.Run("with all good", func(t *testing.T) {
|
|
state := probeservices.State{
|
|
ClientID: "xx-x-xxx-xx",
|
|
Password: "xx",
|
|
}
|
|
if state.Credentials() == nil {
|
|
t.Fatal("expected valid auth here")
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestStateFileMemoryIntegration(t *testing.T) {
|
|
// Does the StateFile have the property that we can write
|
|
// values into it and then read again the same files?
|
|
sf := probeservices.NewStateFile(&kvstore.Memory{})
|
|
s := probeservices.State{
|
|
Expire: time.Now(),
|
|
Password: "xy",
|
|
Token: "abc",
|
|
ClientID: "xx",
|
|
}
|
|
if err := sf.Set(s); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
os := sf.Get()
|
|
diff := cmp.Diff(s, os)
|
|
if diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
|
|
func TestStateFileSetMarshalError(t *testing.T) {
|
|
sf := probeservices.NewStateFile(&kvstore.Memory{})
|
|
s := probeservices.State{
|
|
Expire: time.Now(),
|
|
Password: "xy",
|
|
Token: "abc",
|
|
ClientID: "xx",
|
|
}
|
|
expected := errors.New("mocked error")
|
|
failingfunc := func(v interface{}) ([]byte, error) {
|
|
return nil, expected
|
|
}
|
|
if err := sf.SetMockable(s, failingfunc); !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|
|
|
|
func TestStateFileGetKVStoreGetError(t *testing.T) {
|
|
sf := probeservices.NewStateFile(&kvstore.Memory{})
|
|
expected := errors.New("mocked error")
|
|
failingfunc := func(string) ([]byte, error) {
|
|
return nil, expected
|
|
}
|
|
s, err := sf.GetMockable(failingfunc, json.Unmarshal)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if s.ClientID != "" {
|
|
t.Fatal("unexpected ClientID field")
|
|
}
|
|
if !s.Expire.IsZero() {
|
|
t.Fatal("unexpected Expire field")
|
|
}
|
|
if s.Password != "" {
|
|
t.Fatal("unexpected Password field")
|
|
}
|
|
if s.Token != "" {
|
|
t.Fatal("unexpected Token field")
|
|
}
|
|
}
|
|
|
|
func TestStateFileGetUnmarshalError(t *testing.T) {
|
|
sf := probeservices.NewStateFile(&kvstore.Memory{})
|
|
if err := sf.Set(probeservices.State{}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
expected := errors.New("mocked error")
|
|
failingfunc := func([]byte, interface{}) error {
|
|
return expected
|
|
}
|
|
s, err := sf.GetMockable(sf.Store.Get, failingfunc)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if s.ClientID != "" {
|
|
t.Fatal("unexpected ClientID field")
|
|
}
|
|
if !s.Expire.IsZero() {
|
|
t.Fatal("unexpected Expire field")
|
|
}
|
|
if s.Password != "" {
|
|
t.Fatal("unexpected Password field")
|
|
}
|
|
if s.Token != "" {
|
|
t.Fatal("unexpected Token field")
|
|
}
|
|
}
|