From eb715fbbbdc6b155512aed7c577e39b81bd35840 Mon Sep 17 00:00:00 2001 From: Chew Choon Keat Date: Mon, 13 Mar 2017 03:21:21 +0000 Subject: [PATCH] net/http: unset proxy environment after test Fix last proxy in TestProxyFromEnvironment bleeds into other tests Change ResetProxyEnv to use the newer os.Unsetenv, instead of hard coding as "" Change-Id: I67cf833dbcf4bec2e10ea73c354334160cf05f84 Reviewed-on: https://go-review.googlesource.com/38115 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/net/http/proxy_test.go | 2 +- src/net/http/transport_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/net/http/proxy_test.go b/src/net/http/proxy_test.go index 823d1447ee..8d3a78b962 100644 --- a/src/net/http/proxy_test.go +++ b/src/net/http/proxy_test.go @@ -75,7 +75,7 @@ func TestCacheKeys(t *testing.T) { func ResetProxyEnv() { for _, v := range []string{"HTTP_PROXY", "http_proxy", "NO_PROXY", "no_proxy"} { - os.Setenv(v, "") + os.Unsetenv(v) } ResetCachedEnvironment() } diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 09bfef4b10..8e211aad27 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -2243,6 +2243,7 @@ var proxyFromEnvTests = []proxyFromEnvTest{ func TestProxyFromEnvironment(t *testing.T) { ResetProxyEnv() + defer ResetProxyEnv() for _, tt := range proxyFromEnvTests { os.Setenv("HTTP_PROXY", tt.env) os.Setenv("HTTPS_PROXY", tt.httpsenv)