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/resolver): add CloseIdleConnections to RoundTripper (#501)

Browse source 
While there, also change to pointer receiver and use internal
testing for what are clearly unit tests.

Part of https://github.com/ooni/probe/issues/1591.
This commit is contained in:
Simone Basso 2021-09-09 20:49:12 +02:00 • committed by GitHub
commit 1eb9e8c9b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 203 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -680,7 +680,7 @@ func TestNewDNSClientPowerdnsDoH(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -696,7 +696,7 @@ func TestNewDNSClientGoogleDoH(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -712,7 +712,7 @@ func TestNewDNSClientCloudflareDoH(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -733,7 +733,7 @@ func TestNewDNSClientCloudflareDoHSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
if _, ok := txp.RoundTripper.(resolver.DNSOverHTTPS); !ok {
if _, ok := txp.RoundTripper.(*resolver.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -749,7 +749,7 @@ func TestNewDNSClientUDP(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(resolver.DNSOverUDP); !ok {
if _, ok := r.Transport().(*resolver.DNSOverUDP); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -770,7 +770,7 @@ func TestNewDNSClientUDPDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
if _, ok := txp.RoundTripper.(resolver.DNSOverUDP); !ok {
if _, ok := txp.RoundTripper.(*resolver.DNSOverUDP); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -786,7 +786,7 @@ func TestNewDNSClientTCP(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
txp, ok := r.Transport().(resolver.DNSOverTCP)
txp, ok := r.Transport().(*resolver.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -811,7 +811,7 @@ func TestNewDNSClientTCPDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
dotcp, ok := txp.RoundTripper.(resolver.DNSOverTCP)
dotcp, ok := txp.RoundTripper.(*resolver.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -831,7 +831,7 @@ func TestNewDNSClientDoT(t *testing.T) {
if !ok {
t.Fatal("not the resolver we expected")
}
txp, ok := r.Transport().(resolver.DNSOverTCP)
txp, ok := r.Transport().(*resolver.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -856,7 +856,7 @@ func TestNewDNSClientDoTDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
dotls, ok := txp.RoundTripper.(resolver.DNSOverTCP)
dotls, ok := txp.RoundTripper.(*resolver.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}