github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch some commands to use its own scheme

Browse Source
This commit is contained in:
ymqytw
2017-10-27 18:31:42 -07:00
parent 35468469eb
commit 4487cc5e15
64 changed files with 362 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/kubectl/configmap_test.go
View File

@@ -22,22 +22,22 @@ import (
"reflect"
"testing"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
)
func TestConfigMapGenerate(t *testing.T) {
tests := []struct {
setup func(t *testing.T, params map[string]interface{}) func()
params map[string]interface{}
expected *api.ConfigMap
expected *v1.ConfigMap
expectErr bool
}{
{
params: map[string]interface{}{
"name": "foo",
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
@@ -50,7 +50,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "foo",
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-867km9574f",
},
@@ -63,7 +63,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "foo",
"type": "my-type",
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
@@ -77,7 +77,7 @@ func TestConfigMapGenerate(t *testing.T) {
"type": "my-type",
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-867km9574f",
},
@@ -90,7 +90,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "foo",
"from-literal": []string{"key1=value1", "key2=value2"},
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
@@ -107,7 +107,7 @@ func TestConfigMapGenerate(t *testing.T) {
"from-literal": []string{"key1=value1", "key2=value2"},
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-gcb75dd9gb",
},
@@ -144,7 +144,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "foo",
"from-literal": []string{"key1==value1"},
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
@@ -160,7 +160,7 @@ func TestConfigMapGenerate(t *testing.T) {
"from-literal": []string{"key1==value1"},
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-bdgk9ttt7m",
},
@@ -176,7 +176,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "valid_env",
"from-env-file": "file.env",
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "valid_env",
},
@@ -194,7 +194,7 @@ func TestConfigMapGenerate(t *testing.T) {
"from-env-file": "file.env",
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "valid_env-2cgh8552ch",
},
@@ -215,7 +215,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "getenv",
"from-env-file": "file.env",
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "getenv",
},
@@ -237,7 +237,7 @@ func TestConfigMapGenerate(t *testing.T) {
"from-env-file": "file.env",
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "getenv-b4hh92hgdk",
},
@@ -270,7 +270,7 @@ func TestConfigMapGenerate(t *testing.T) {
"name": "with_spaces",
"from-env-file": "file.env",
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "with_spaces",
},
@@ -287,7 +287,7 @@ func TestConfigMapGenerate(t *testing.T) {
"from-env-file": "file.env",
"append-hash": true,
},
expected: &api.ConfigMap{
expected: &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "with_spaces-bfc558b4ct",
},
@@ -312,8 +312,8 @@ func TestConfigMapGenerate(t *testing.T) {
if test.expectErr && err != nil {
continue
}
if !reflect.DeepEqual(obj.(*api.ConfigMap), test.expected) {
t.Errorf("\ncase %d, expected:\n%#v\nsaw:\n%#v", i, test.expected, obj.(*api.ConfigMap))
if !reflect.DeepEqual(obj.(*v1.ConfigMap), test.expected) {
t.Errorf("\ncase %d, expected:\n%#v\nsaw:\n%#v", i, test.expected, obj.(*v1.ConfigMap))
}
}
}