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

Remove ConvertPodStatusToAPIPodStatus from runtime interface

Browse Source
This commit is contained in:
Random-Liu
2016-01-26 19:25:35 -08:00
committed by Lantao Liu
parent bd67b8a5db
commit 2b7d0182ca
7 changed files with 3 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/dockertools/manager_test.go
View File

@@ -550,17 +550,14 @@ func runSyncPod(t *testing.T, dm *DockerManager, fakeDocker *FakeDockerClient, p
if err != nil {
t.Errorf("unexpected error: %v", err)
}
var apiPodStatus *api.PodStatus
apiPodStatus, err = dm.ConvertPodStatusToAPIPodStatus(pod, podStatus)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
fakeDocker.ClearCalls()
if backOff == nil {
backOff = util.NewBackOff(time.Second, time.Minute)
}
result := dm.SyncPod(pod, *apiPodStatus, podStatus, []api.Secret{}, backOff)
// TODO(random-liu): Add test for PodSyncResult
// api.PodStatus is not used in SyncPod now, pass in an empty one.
result := dm.SyncPod(pod, api.PodStatus{}, podStatus, []api.Secret{}, backOff)
err = result.Error()
if err != nil && !expectErr {
t.Errorf("unexpected error: %v", err)