Revert "fix kubectl config view to respect serialization formats"

This commit is contained in:
Jeff Lowdermilk
2015-02-24 12:06:24 -08:00
parent e77322a561
commit 8cfe099af1
2 changed files with 2 additions and 43 deletions

View File

@@ -18,7 +18,6 @@ package config
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"reflect"
@@ -48,36 +47,6 @@ type configCommandTest struct {
expectedOutputs []string
}
func ExampleView() {
expectedConfig := newRedFederalCowHammerConfig()
test := configCommandTest{
args: []string{"view"},
startingConfig: newRedFederalCowHammerConfig(),
expectedConfig: expectedConfig,
}
output := test.run(nil)
fmt.Printf("%v", output)
// Output:
// apiVersion: v1
// clusters:
// - cluster:
// server: http://cow.org:8080
// name: cow-cluster
// contexts:
// - context:
// cluster: cow-cluster
// user: red-user
// name: federal-context
// current-context: ""
// kind: Config
// preferences: {}
// users:
// - name: red-user
// user:
// token: red-token
}
func TestSetCurrentContext(t *testing.T) {
expectedConfig := newRedFederalCowHammerConfig()
expectedConfig.CurrentContext = "the-new-context"
@@ -571,7 +540,7 @@ func testConfigCommand(args []string, startingConfig clientcmdapi.Config) (strin
return buf.String(), *config
}
func (test configCommandTest) run(t *testing.T) string {
func (test configCommandTest) run(t *testing.T) {
out, actualConfig := testConfigCommand(test.args, test.startingConfig)
testSetNilMapsToEmpties(reflect.ValueOf(&test.expectedConfig))
@@ -587,8 +556,6 @@ func (test configCommandTest) run(t *testing.T) string {
t.Errorf("expected '%s' in output, got '%s'", expectedOutput, out)
}
}
return out
}
func testSetNilMapsToEmpties(curr reflect.Value) {
actualCurrValue := curr