Merge pull request #769 from jdsutherland/configure-test-dead-code

Remove dead code from configure_test

Author: Katrina Owen

cmd/configure_test.go

@@ -18,14 +18,6 @@ import (
 )
 
 func TestBareConfigure(t *testing.T) {
-	oldErr := Err
-	defer func() {
-		Err = oldErr
-	}()
-
-	var buf bytes.Buffer
-	Err = &buf
-
 	flags := pflag.NewFlagSet("fake", pflag.PanicOnError)
 	setupConfigureFlags(flags)
 
@@ -49,8 +41,7 @@ func TestConfigureShow(t *testing.T) {
 		Err = oldErr
 	}()
 
-	var buf bytes.Buffer
-	Err = &buf
+	Err = &bytes.Buffer{}
 
 	flags := pflag.NewFlagSet("fake", pflag.PanicOnError)
 	setupConfigureFlags(flags)
@@ -82,7 +73,7 @@ func TestConfigureShow(t *testing.T) {
 	assert.NotRegexp(t, "override.example", Err)
 
 	assert.Regexp(t, "configured-token", Err)
-	assert.NotRegexp(t, "token-overrid", Err)
+	assert.NotRegexp(t, "token-override", Err)
 
 	assert.Regexp(t, "configured-workspace", Err)
 	assert.NotRegexp(t, "workspace-override", Err)
@@ -150,17 +141,12 @@ func TestConfigureToken(t *testing.T) {
 	defer ts.Close()
 
 	oldOut := Out
-	oldErr := Err
 	Out = ioutil.Discard
 	defer func() {
 		Out = oldOut
-		Err = oldErr
 	}()
 
 	for _, tc := range testCases {
-		var buf bytes.Buffer
-		Err = &buf
-
 		flags := pflag.NewFlagSet("fake", pflag.PanicOnError)
 		setupConfigureFlags(flags)
 
@@ -238,17 +224,12 @@ func TestConfigureAPIBaseURL(t *testing.T) {
 	}
 
 	oldOut := Out
-	oldErr := Err
 	Out = ioutil.Discard
 	defer func() {
 		Out = oldOut
-		Err = oldErr
 	}()
 
 	for _, tc := range testCases {
-		var buf bytes.Buffer
-		Err = &buf
-
 		flags := pflag.NewFlagSet("fake", pflag.PanicOnError)
 		setupConfigureFlags(flags)