306d18e466
Here's the squash of the following patches that enable support
for go1.18 and update our dependencies.
This diff WILL need to be backported to the release/3.14 branch.
* chore: use go1.17.8
See https://github.com/ooni/probe/issues/2067
* chore: upgrade to probe-assets@v0.8.0
See https://github.com/ooni/probe/issues/2067.
* chore: update dependencies and enable go1.18
As mentioned in 7a0d17ea91
,
the tree won't build with `go1.18` unless we say it does.
So, not only here we need to update dependencies but also we
need to explicitly say `go1.18` in the `go.mod`.
This work is part of https://github.com/ooni/probe/issues/2067.
* chore(coverage.yml): run with go1.18
This change will give us a bare minimum confidence that we're
going to build our tree using version 1.18 of golang.
See https://github.com/ooni/probe/issues/2067.
* chore: update user agent used for measuring
See https://github.com/ooni/probe/issues/2067
* chore: run `go generate ./...`
See https://github.com/ooni/probe/issues/2067
* fix(dialer_test.go): make test work with go1.17 and go1.18
1. the original test wanted the dial to fail, so ensure we're not
passing any domain name to exercise dialing not resolving;
2. match the end of the error rather than the whole error string.
Tested locally with both go1.17 and go1.18.
See https://github.com/ooni/probe-cli/pull/708#issuecomment-1096447186
224 lines
5.1 KiB
Go
224 lines
5.1 KiB
Go
// Code generated by go generate; DO NOT EDIT.
|
|
// 2022-04-12 11:16:00.581209 +0200 CEST m=+0.000165542
|
|
|
|
package ooapi
|
|
|
|
//go:generate go run ./internal/generator -file caching_test.go
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
|
)
|
|
|
|
func TestCachesimpleMeasurementMetaAPISuccess(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
var expect *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&expect)
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
API: &FakeMeasurementMetaAPI{
|
|
Response: expect,
|
|
},
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
ctx := context.Background()
|
|
resp, err := cache.Call(ctx, req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if resp == nil {
|
|
t.Fatal("expected non-nil response")
|
|
}
|
|
if diff := cmp.Diff(expect, resp); diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPIWriteCacheError(t *testing.T) {
|
|
errMocked := errors.New("mocked error")
|
|
ff := &fakeFill{}
|
|
var expect *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&expect)
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
API: &FakeMeasurementMetaAPI{
|
|
Response: expect,
|
|
},
|
|
KVStore: &FakeKVStore{SetError: errMocked},
|
|
}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
ctx := context.Background()
|
|
resp, err := cache.Call(ctx, req)
|
|
if !errors.Is(err, errMocked) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected nil response")
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPIFailureWithNoCache(t *testing.T) {
|
|
errMocked := errors.New("mocked error")
|
|
ff := &fakeFill{}
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
API: &FakeMeasurementMetaAPI{
|
|
Err: errMocked,
|
|
},
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
ctx := context.Background()
|
|
resp, err := cache.Call(ctx, req)
|
|
if !errors.Is(err, errMocked) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if resp != nil {
|
|
t.Fatal("expected nil response")
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPIFailureWithPreviousCache(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
var expect *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&expect)
|
|
fakeapi := &FakeMeasurementMetaAPI{
|
|
Response: expect,
|
|
}
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
API: fakeapi,
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
ctx := context.Background()
|
|
// first pass with no error at all
|
|
// use a separate scope to be sure we avoid mistakes
|
|
{
|
|
resp, err := cache.Call(ctx, req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if resp == nil {
|
|
t.Fatal("expected non-nil response")
|
|
}
|
|
if diff := cmp.Diff(expect, resp); diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
// second pass with failure
|
|
errMocked := errors.New("mocked error")
|
|
fakeapi.Err = errMocked
|
|
fakeapi.Response = nil
|
|
resp2, err := cache.Call(ctx, req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if resp2 == nil {
|
|
t.Fatal("expected non-nil response")
|
|
}
|
|
if diff := cmp.Diff(expect, resp2); diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPISetcacheWithEncodeError(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
errMocked := errors.New("mocked error")
|
|
var in []cacheEntryForMeasurementMetaAPI
|
|
ff.Fill(&in)
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
GobCodec: &FakeCodec{EncodeErr: errMocked},
|
|
}
|
|
err := cache.setcache(in)
|
|
if !errors.Is(err, errMocked) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPIReadCacheNotFound(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
var incache []cacheEntryForMeasurementMetaAPI
|
|
ff.Fill(&incache)
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
err := cache.setcache(incache)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
out, err := cache.readcache(req)
|
|
if !errors.Is(err, errCacheNotFound) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if out != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPIWriteCacheDuplicate(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
var resp1 *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&resp1)
|
|
var resp2 *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&resp2)
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
err := cache.writecache(req, resp1)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
err = cache.writecache(req, resp2)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
out, err := cache.readcache(req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if out == nil {
|
|
t.Fatal("expected non-nil here")
|
|
}
|
|
if diff := cmp.Diff(resp2, out); diff != "" {
|
|
t.Fatal(diff)
|
|
}
|
|
}
|
|
|
|
func TestCachesimpleMeasurementMetaAPICacheSizeLimited(t *testing.T) {
|
|
ff := &fakeFill{}
|
|
cache := &withCacheMeasurementMetaAPI{
|
|
KVStore: &kvstore.Memory{},
|
|
}
|
|
var prev int
|
|
for {
|
|
var req *apimodel.MeasurementMetaRequest
|
|
ff.Fill(&req)
|
|
var resp *apimodel.MeasurementMetaResponse
|
|
ff.Fill(&resp)
|
|
err := cache.writecache(req, resp)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
out, err := cache.getcache()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(out) > prev {
|
|
prev = len(out)
|
|
continue
|
|
}
|
|
break
|
|
}
|
|
}
|