c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(netx/dialer): hide implementation complexity (#372)

Browse source 
* refactor(netx/dialer): hide implementation complexity

This follows the blueprint of `module.Config` and `nodule.New`
described at https://github.com/ooni/probe/issues/1591.

* fix: ndt7 bug where we were not using the right resolver

* fix(legacy/netx): clarify irrelevant implementation change

* fix: improve comments

* fix(hhfm): do not use dialer.New b/c it breaks it

Unclear to me why this is happening. Still, improve upon the
previous situation by adding a timeout.

It does not seem a priority to look into this issue now.
This commit is contained in:
Simone Basso 2021-06-09 09:42:31 +02:00 • committed by GitHub
commit 06ee0e55a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 312 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/engine/netx/dialer/system_test.go
View file

@ -11,7 +11,7 @@ import (
func TestSystemDialerWorks(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
cancel() // fail immediately
conn, err := Default.DialContext(ctx, "tcp", "8.8.8.8:853")
conn, err := systemDialer.DialContext(ctx, "tcp", "8.8.8.8:853")
if err == nil || !strings.HasSuffix(err.Error(), "operation was canceled") {
t.Fatal("not the error we expected", err)
}
@ -20,9 +20,9 @@ func TestSystemDialerWorks(t *testing.T) {
}
}
func TestUnderlyingDialerHasTimeout(t *testing.T) {
func TestSystemDialerHasTimeout(t *testing.T) {
expected := 15 * time.Second
if underlyingDialer.Timeout != expected {
if systemDialer.Timeout != expected {
t.Fatal("unexpected timeout value")
}
}