c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(resolver_test.go): remove race and make deterministic (#524)

Browse Source 
Should fix https://github.com/ooni/probe-cli/pull/523#issuecomment-930430124.

Work part of https://github.com/ooni/probe-cli/pull/506.
This commit is contained in:
Simone Basso 2021-09-29 20:33:39 +02:00 committed by GitHub
parent b2b1a4b2f1
commit 26f84ccc20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/netxlite/resolver_test.go
View File

@ -93,11 +93,12 @@ func TestResolverSystem(t *testing.T) {
t.Run("with timeout and success", func(t *testing.T) { t.Run("with timeout and success", func(t *testing.T) {
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
wg.Add(1) wg.Add(1)
done := make(chan interface{})
r := &resolverSystem{ r := &resolverSystem{
testableTimeout: 1 * time.Microsecond, testableTimeout: 1 * time.Microsecond,
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) { testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
defer wg.Done() defer wg.Done()
time.Sleep(1 * time.Millisecond) <-done
return []string{"8.8.8.8"}, nil return []string{"8.8.8.8"}, nil
}, },
} }
@ -109,17 +110,19 @@ func TestResolverSystem(t *testing.T) {
if addrs != nil { if addrs != nil {
t.Fatal("invalid addrs") t.Fatal("invalid addrs")
} }
close(done)
wg.Wait() wg.Wait()
}) })
t.Run("with timeout and failure", func(t *testing.T) { t.Run("with timeout and failure", func(t *testing.T) {
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
wg.Add(1) wg.Add(1)
done := make(chan interface{})
r := &resolverSystem{ r := &resolverSystem{
testableTimeout: 1 * time.Microsecond, testableTimeout: 1 * time.Microsecond,
testableLookupHost: func(ctx context.Context, domain string) ([]string, error) { testableLookupHost: func(ctx context.Context, domain string) ([]string, error) {
defer wg.Done() defer wg.Done()
time.Sleep(1 * time.Millisecond) <-done
return nil, errors.New("no such host") return nil, errors.New("no such host")
}, },
} }
@ -131,6 +134,7 @@ func TestResolverSystem(t *testing.T) {
if addrs != nil { if addrs != nil {
t.Fatal("invalid addrs") t.Fatal("invalid addrs")
} }
close(done)
wg.Wait() wg.Wait()
}) })