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): the TimeoutDialer is useless (#366)

Browse source 
We already configure a timeout in the underlying dialer, hence
there's no point in keeping the TimeoutDialer around.

Part of https://github.com/ooni/probe/issues/1507
This commit is contained in:
Simone Basso 2021-06-08 21:56:57 +02:00 • committed by GitHub
commit 8ad17775fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

36
internal/engine/netx/netx_test.go
View file

@ -241,11 +241,7 @@ func TestNewDialerVanilla(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}
@ -281,11 +277,7 @@ func TestNewDialerWithResolver(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}
@ -330,11 +322,7 @@ func TestNewDialerWithLogger(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}
@ -380,11 +368,7 @@ func TestNewDialerWithDialSaver(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}
@ -430,11 +414,7 @@ func TestNewDialerWithReadWriteSaver(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}
@ -476,11 +456,7 @@ func TestNewDialerWithContextByteCounting(t *testing.T) {
if !ok {
t.Fatal("not the dialer we expected")
}
td, ok := ewd.Dialer.(dialer.TimeoutDialer)
if !ok {
t.Fatal("not the dialer we expected")
}
if _, ok := td.Dialer.(dialer.SystemDialer); !ok {
if _, ok := ewd.Dialer.(dialer.SystemDialer); !ok {
t.Fatal("not the dialer we expected")
}
}