Merge pull request #61 from haya14busa/os-unset-env

Use os.Unsetenv() instead of os.Setenv(key, "")
reviewdog · Dec 15, 2016 · 162ac04 · 162ac04
2 parents 79d5549 + 6405b45
commit 162ac04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/reviewdog/main_test.go b/cmd/reviewdog/main_test.go
@@ -144,7 +144,7 @@ func TestRun_travis(t *testing.T) {
 	saveEnvs := make(map[string]string)
 	for _, key := range envs {
 		saveEnvs[key] = os.Getenv(key)
-		os.Setenv(key, "")
+		os.Unsetenv(key)
 	}
 	// restore
 	defer func() {
@@ -236,7 +236,7 @@ func TestCircleci(t *testing.T) {
 	saveEnvs := make(map[string]string)
 	for _, key := range envs {
 		saveEnvs[key] = os.Getenv(key)
-		os.Setenv(key, "")
+		os.Unsetenv(key)
 	}
 	// restore
 	defer func() {
@@ -256,7 +256,7 @@ func TestCircleci(t *testing.T) {
 		t.Log(err)
 	}
 
-	os.Setenv("CI_PULL_REQUEST", "")
+	os.Unsetenv("CI_PULL_REQUEST")
 	os.Setenv("CIRCLE_PR_NUMBER", "invalid")
 	if _, _, err := circleci(); err == nil {
 		t.Error("error expected but got nil")
@@ -322,7 +322,7 @@ func TestDroneio(t *testing.T) {
 	saveEnvs := make(map[string]string)
 	for _, key := range envs {
 		saveEnvs[key] = os.Getenv(key)
-		os.Setenv(key, "")
+		os.Unsetenv(key)
 	}
 	// restore
 	defer func() {
@@ -401,7 +401,7 @@ func TestCommonci(t *testing.T) {
 	saveEnvs := make(map[string]string)
 	for _, key := range envs {
 		saveEnvs[key] = os.Getenv(key)
-		os.Setenv(key, "")
+		os.Unsetenv(key)
 	}
 	// restore
 	defer func() {

diff --git a/project/run.go b/project/run.go
@@ -55,7 +55,7 @@ var secretEnvs = [...]string{
 func filteredEnviron() []string {
 	for _, name := range secretEnvs {
 		defer os.Setenv(name, os.Getenv(name))
-		os.Setenv(name, "")
+		os.Unsetenv(name)
 	}
 	return os.Environ()
 }
diff --git a/project/run_test.go b/project/run_test.go
@@ -132,8 +132,8 @@ func TestFilteredEnviron(t *testing.T) {
 	os.Setenv(name, "value")
 
 	filtered := filteredEnviron()
-	if len(filtered) != len(os.Environ()) {
-		t.Errorf("len(filtered) != len(os.Environ()), %v != %v", len(filtered), len(os.Environ()))
+	if len(filtered) != len(os.Environ())-1 {
+		t.Errorf("len(filtered) != len(os.Environ())-1, %v != %v-1", len(filtered), len(os.Environ()))
 	}
 
 	for _, kv := range filtered {