github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

fix broken TestExecutorLaunchAndKillTask unit test

Browse Source
This commit is contained in:
James DeFelice 2015-06-14 03:38:29 +00:00
parent eca5a2ac88
commit 5e4992aa5e
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/mesos/pkg/executor/executor.go
View File

@ -19,6 +19,7 @@ package executor
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net"
"strings" "strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
@ -97,10 +98,15 @@ type suicideWatcher interface {
type podStatusFunc func() (*api.PodStatus, error) type podStatusFunc func() (*api.PodStatus, error)
// KubeletInterface consists of the kubelet.Kubelet API's that we actually use
type KubeletInterface interface {
GetHostIP() (net.IP, error)
}
// KubernetesExecutor is an mesos executor that runs pods // KubernetesExecutor is an mesos executor that runs pods
// in a minion machine. // in a minion machine.
type KubernetesExecutor struct { type KubernetesExecutor struct {
kl *kubelet.Kubelet // the kubelet instance. kl KubeletInterface // the kubelet instance.
updateChan chan<- interface{} // to send pod config updates to the kubelet updateChan chan<- interface{} // to send pod config updates to the kubelet
state stateType state stateType
tasks map[string]*kuberTask tasks map[string]*kuberTask
@ -118,11 +124,11 @@ type KubernetesExecutor struct {
kubeletFinished <-chan struct{} // signals that kubelet Run() died kubeletFinished <-chan struct{} // signals that kubelet Run() died
initialRegistration sync.Once initialRegistration sync.Once
exitFunc func(int) exitFunc func(int)
podStatusFunc func(*kubelet.Kubelet, *api.Pod) (*api.PodStatus, error) podStatusFunc func(KubeletInterface, *api.Pod) (*api.PodStatus, error)
} }
type Config struct { type Config struct {
Kubelet *kubelet.Kubelet Kubelet KubeletInterface
Updates chan<- interface{} // to send pod config updates to the kubelet Updates chan<- interface{} // to send pod config updates to the kubelet
SourceName string SourceName string
APIClient *client.Client APIClient *client.Client
@ -132,7 +138,7 @@ type Config struct {
SuicideTimeout time.Duration SuicideTimeout time.Duration
KubeletFinished <-chan struct{} // signals that kubelet Run() died KubeletFinished <-chan struct{} // signals that kubelet Run() died
ExitFunc func(int) ExitFunc func(int)
PodStatusFunc func(*kubelet.Kubelet, *api.Pod) (*api.PodStatus, error) PodStatusFunc func(KubeletInterface, *api.Pod) (*api.PodStatus, error)
} }
func (k *KubernetesExecutor) isConnected() bool { func (k *KubernetesExecutor) isConnected() bool {

16
contrib/mesos/pkg/executor/executor_test.go
View File

@ -18,6 +18,7 @@ package executor
import ( import (
"fmt" "fmt"
"net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"reflect" "reflect"
@ -285,6 +286,15 @@ func TestExecutorReregister(t *testing.T) {
mockDriver.AssertExpectations(t) mockDriver.AssertExpectations(t)
} }
type fakeKubelet struct {
*kubelet.Kubelet
hostIP net.IP
}
func (kl *fakeKubelet) GetHostIP() (net.IP, error) {
return kl.hostIP, nil
}
// TestExecutorLaunchAndKillTask ensures that the executor is able to launch // TestExecutorLaunchAndKillTask ensures that the executor is able to launch
// and kill tasks while properly bookkeping its tasks. // and kill tasks while properly bookkeping its tasks.
func TestExecutorLaunchAndKillTask(t *testing.T) { func TestExecutorLaunchAndKillTask(t *testing.T) {
@ -304,8 +314,11 @@ func TestExecutorLaunchAndKillTask(t *testing.T) {
Host: testApiServer.server.URL, Host: testApiServer.server.URL,
Version: testapi.Version(), Version: testapi.Version(),
}), }),
Kubelet: &fakeKubelet{
Kubelet: &kubelet.Kubelet{}, Kubelet: &kubelet.Kubelet{},
PodStatusFunc: func(kl *kubelet.Kubelet, pod *api.Pod) (*api.PodStatus, error) { hostIP: net.IPv4(127, 0, 0, 1),
},
PodStatusFunc: func(kl KubeletInterface, pod *api.Pod) (*api.PodStatus, error) {
return &api.PodStatus{ return &api.PodStatus{
ContainerStatuses: []api.ContainerStatus{ ContainerStatuses: []api.ContainerStatus{
{ {
@ -331,6 +344,7 @@ func TestExecutorLaunchAndKillTask(t *testing.T) {
} }
pod := NewTestPod(1) pod := NewTestPod(1)
pod.Spec.Containers[0].Name = "foo"
podTask, err := podtask.New(api.NewDefaultContext(), "", podTask, err := podtask.New(api.NewDefaultContext(), "",
*pod, &mesosproto.ExecutorInfo{}) *pod, &mesosproto.ExecutorInfo{})
assert.Equal(t, nil, err, "must be able to create a task from a pod") assert.Equal(t, nil, err, "must be able to create a task from a pod")

4
contrib/mesos/pkg/executor/service/service.go
View File

@ -376,8 +376,8 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
} }
}, },
ExitFunc: os.Exit, ExitFunc: os.Exit,
PodStatusFunc: func(kl *kubelet.Kubelet, pod *api.Pod) (*api.PodStatus, error) { PodStatusFunc: func(_ executor.KubeletInterface, pod *api.Pod) (*api.PodStatus, error) {
return kl.GetRuntime().GetPodStatus(pod) return klet.GetRuntime().GetPodStatus(pod)
}, },
}) })