From: Russ Cox <rsc@golang.org>
Date: Wed, 5 Jun 2019 16:33:30 +0000 (-0400)
Subject: net: fix conf.teardown call in TestGoLookupIPOrderFallbackToFile
X-Git-Tag: go1.13beta1~137
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4ed2e193bd1609a0f59ea2ec5343b4f106f92f95;p=gostls13.git

net: fix conf.teardown call in TestGoLookupIPOrderFallbackToFile

If the test fails, conf.teardown wouldn't be.
It doesn't look like it matters much, but clean up anyway.

Change-Id: I45c18095abfd49422975d061be20cbd971a98f8f
Reviewed-on: https://go-review.googlesource.com/c/go/+/180780
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index 1b67494e51..98304d36ea 100644
--- a/src/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
@@ -589,6 +589,8 @@ func TestGoLookupIPOrderFallbackToFile(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer conf.teardown()
+
 	if err := conf.writeAndUpdate([]string{}); err != nil {
 		t.Fatal(err)
 	}
@@ -620,7 +622,6 @@ func TestGoLookupIPOrderFallbackToFile(t *testing.T) {
 			t.Errorf("%s: address doesn't match expectation. got %v, want %v", name, got, want)
 		}
 	}
-	defer conf.teardown()
 }
 
 // Issue 12712.