github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove string from Reaper.Stop signature

Browse Source
This commit is contained in:
Maciej Szulik
2015-11-12 15:42:29 +01:00
parent 706d3a77a9
commit 64f778804d
7 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubectl/stop_test.go
View File

@@ -37,7 +37,6 @@ func TestReplicationControllerStop(t *testing.T) {
Name string
Objs []runtime.Object
StopError error
StopMessage string
ExpectedActions []string
}{
{
@@ -67,7 +66,6 @@ func TestReplicationControllerStop(t *testing.T) {
},
},
StopError: nil,
StopMessage: "foo stopped",
ExpectedActions: []string{"get", "list", "get", "update", "get", "get", "delete"},
},
{
@@ -106,7 +104,6 @@ func TestReplicationControllerStop(t *testing.T) {
},
},
StopError: nil,
StopMessage: "foo stopped",
ExpectedActions: []string{"get", "list", "get", "update", "get", "get", "delete"},
},
{
@@ -146,7 +143,6 @@ func TestReplicationControllerStop(t *testing.T) {
},
},
StopError: fmt.Errorf("Detected overlapping controllers for rc foo: baz, please manage deletion individually with --cascade=false."),
StopMessage: "",
ExpectedActions: []string{"get", "list"},
},
@@ -197,7 +193,6 @@ func TestReplicationControllerStop(t *testing.T) {
},
StopError: fmt.Errorf("Detected overlapping controllers for rc foo: baz,zaz, please manage deletion individually with --cascade=false."),
StopMessage: "",
ExpectedActions: []string{"get", "list"},
},
@@ -239,7 +234,6 @@ func TestReplicationControllerStop(t *testing.T) {
},
StopError: nil,
StopMessage: "foo stopped",
ExpectedActions: []string{"get", "list", "delete"},
},
}
@@ -247,16 +241,12 @@ func TestReplicationControllerStop(t *testing.T) {
for _, test := range tests {
fake := testclient.NewSimpleFake(test.Objs...)
reaper := ReplicationControllerReaper{fake, time.Millisecond, time.Millisecond}
s, err := reaper.Stop(ns, name, 0, nil)
err := reaper.Stop(ns, name, 0, nil)
if !reflect.DeepEqual(err, test.StopError) {
t.Errorf("%s unexpected error: %v", test.Name, err)
continue
}
if s != test.StopMessage {
t.Errorf("%s expected '%s', got '%s'", test.Name, test.StopMessage, s)
continue
}
actions := fake.Actions()
if len(actions) != len(test.ExpectedActions) {
t.Errorf("%s unexpected actions: %v, expected %d actions got %d", test.Name, actions, len(test.ExpectedActions), len(actions))
@@ -281,7 +271,6 @@ func TestJobStop(t *testing.T) {
Name string
Objs []runtime.Object
StopError error
StopMessage string
ExpectedActions []string
}{
{
@@ -316,8 +305,7 @@ func TestJobStop(t *testing.T) {
},
},
},
StopError: nil,
StopMessage: "foo stopped",
StopError: nil,
ExpectedActions: []string{"get:jobs", "get:jobs", "update:jobs",
"get:jobs", "get:jobs", "list:pods", "delete:jobs"},
},
@@ -364,8 +352,7 @@ func TestJobStop(t *testing.T) {
},
},
},
StopError: nil,
StopMessage: "foo stopped",
StopError: nil,
ExpectedActions: []string{"get:jobs", "get:jobs", "update:jobs",
"get:jobs", "get:jobs", "list:pods", "delete:pods", "delete:jobs"},
},
@@ -374,16 +361,12 @@ func TestJobStop(t *testing.T) {
for _, test := range tests {
fake := testclient.NewSimpleFake(test.Objs...)
reaper := JobReaper{fake, time.Millisecond, time.Millisecond}
s, err := reaper.Stop(ns, name, 0, nil)
err := reaper.Stop(ns, name, 0, nil)
if !reflect.DeepEqual(err, test.StopError) {
t.Errorf("%s unexpected error: %v", test.Name, err)
continue
}
if s != test.StopMessage {
t.Errorf("%s expected '%s', got '%s'", test.Name, test.StopMessage, s)
continue
}
actions := fake.Actions()
if len(actions) != len(test.ExpectedActions) {
t.Errorf("%s unexpected actions: %v, expected %d actions got %d", test.Name, actions, len(test.ExpectedActions), len(actions))
@@ -499,7 +482,7 @@ func TestSimpleStop(t *testing.T) {
if err != nil {
t.Errorf("unexpected error: %v (%s)", err, test.test)
}
s, err := reaper.Stop("default", "foo", 0, nil)
err = reaper.Stop("default", "foo", 0, nil)
if err != nil && !test.expectError {
t.Errorf("unexpected error: %v (%s)", err, test.test)
}
@@ -507,9 +490,6 @@ func TestSimpleStop(t *testing.T) {
if test.expectError {
t.Errorf("unexpected non-error: %v (%s)", err, test.test)
}
if s != "foo stopped" {
t.Errorf("unexpected return: %s (%s)", s, test.test)
}
}
actions := fake.Actions()
if len(test.actions) != len(actions) {