x

internal/engineresolver/resolver.go

@@ -115,7 +115,7 @@ func (r *Resolver) LookupHost(ctx context.Context, hostname string) ([]string, e
 		//
 		// See https://github.com/ooni/probe/issues/2544
 		if err := ctx.Err(); err != nil {
-			me.Add(err)
+			me.Add(newErrWrapper(err, e.URL))
 			continue
 		}
 

internal/engineresolver/resolver_test.go

@@ -47,14 +47,15 @@ func TestTypicalUsageWithFailure(t *testing.T) {
 		t.Fatal("cannot convert error")
 	}
 	for _, child := range me.Children {
+
 		// net.DNSError does not include the underlying error
 		// but just a string representing the error. This
 		// means that we need to go down hunting what's the
 		// real error that occurred and use more verbose code.
 		{
 			var ew *errWrapper
 			if !errors.As(child, &ew) {
-				t.Fatal("not an instance of errwrapper")
+				t.Fatalf("not an instance of errwrapper: '%v' [%T]", child, child)
 			}
 			var de *net.DNSError
 			if errors.As(ew, &de) {
@@ -64,6 +65,7 @@ func TestTypicalUsageWithFailure(t *testing.T) {
 				continue
 			}
 		}
+
 		// otherwise just unwrap and check whether it's
 		// a real context.Canceled error.
 		if !errors.Is(child, context.Canceled) {
@@ -73,9 +75,14 @@ func TestTypicalUsageWithFailure(t *testing.T) {
 	if addrs != nil {
 		t.Fatal("expected nil here")
 	}
-	if len(reso.res) < 1 {
-		t.Fatal("expected to see some resolvers here")
+
+	// since https://github.com/ooni/probe-cli/pull/1351 we avoid
+	// constructing any resolver if we start running with a canceled context
+	// because of https://github.com/ooni/probe/issues/2544
+	if len(reso.res) != 0 {
+		t.Fatal("expected to see no resolvers here")
 	}
+
 	reso.CloseIdleConnections()
 	if len(reso.res) != 0 {
 		t.Fatal("expected to see no resolvers after CloseIdleConnections")