From 51459e23b25c5753ee518cf2cabaf4ff17a79154 Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Thu, 1 Apr 2021 20:11:13 +0200
Subject: [PATCH] fix(oohelper): make sure the CI is green (#282)

* chore(oohelper): increase tests verbosity

Hopefully this helps with https://github.com/ooni/probe/issues/1409.

* fix(oohelper): use a nonstandard resolver

* fix previous

* make the diff pleasant/committable/correct
---
 internal/cmd/oohelper/oohelper.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/internal/cmd/oohelper/oohelper.go b/internal/cmd/oohelper/oohelper.go
index df5482c..914ea8e 100644
--- a/internal/cmd/oohelper/oohelper.go
+++ b/internal/cmd/oohelper/oohelper.go
@@ -24,9 +24,21 @@ var (
 	target      = flag.String("target", "", "Target URL for the test helper")
 )
 
+func newhttpclient() *http.Client {
+	// Use a nonstandard resolver, which is enough to work around the
+	// puzzling https://github.com/ooni/probe/issues/1409 issue.
+	childResolver, err := netx.NewDNSClient(
+		netx.Config{Logger: log.Log}, "dot://8.8.8.8:853")
+	runtimex.PanicOnError(err, "netx.NewDNSClient should not fail here")
+	txp := netx.NewHTTPTransport(netx.Config{
+		BaseResolver: childResolver,
+		Logger:       log.Log,
+	})
+	return &http.Client{Transport: txp}
+}
+
 func init() {
-	txp := netx.NewHTTPTransport(netx.Config{Logger: log.Log})
-	httpClient = &http.Client{Transport: txp}
+	httpClient = newhttpclient()
 	resolver = netx.NewResolver(netx.Config{Logger: log.Log})
 }