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

Revert "Merge pull request #15976 from mesosphere/sur-k8sm-475-error-checking"

Browse Source 
The given merge will be rebased manually and appended to the scheduler refactoring.

This reverts commit 8d923afe23, reversing
changes made to d7458ddd4c.
This commit is contained in:
Dr. Stefan Schimanski
2015-11-11 10:54:23 +01:00
parent b873dce298
commit 4f13ba1af6
5 changed files with 48 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/mesos/pkg/scheduler/plugin_test.go
View File

@@ -880,17 +880,11 @@ func TestDeleteOne_PendingPod(t *testing.T) {
UID: "foo0",
Namespace: api.NamespaceDefault,
}}}
task, err := podtask.New(api.NewDefaultContext(), "bar", *pod.Pod, &mesos.ExecutorInfo{})
_, err := reg.Register(podtask.New(api.NewDefaultContext(), "bar", *pod.Pod, &mesos.ExecutorInfo{}))
if err != nil {
t.Fatalf("failed to create task: %v", err)
}
_, err = reg.Register(task)
if err != nil {
t.Fatalf("failed to register task: %v", err)
}
// preconditions
qr := newQueuer(nil)
qr.podQueue.Add(pod, queue.ReplaceExisting)
@@ -923,13 +917,7 @@ func TestDeleteOne_Running(t *testing.T) {
UID: "foo0",
Namespace: api.NamespaceDefault,
}}}
task, err := podtask.New(api.NewDefaultContext(), "bar", *pod.Pod, &mesos.ExecutorInfo{})
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
task, err = reg.Register(task)
task, err := reg.Register(podtask.New(api.NewDefaultContext(), "bar", *pod.Pod, &mesos.ExecutorInfo{}))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}