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

make testclient threadsafe by guarding internal state with accessors

Browse Source
This commit is contained in:
Mike Danese
2015-07-06 14:37:46 -07:00
parent 59611d7160
commit 1b84fb7d74
28 changed files with 151 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/kubelet/kubelet_test.go
View File

@@ -2322,10 +2322,11 @@ func TestUpdateNewNodeStatus(t *testing.T) {
if err := kubelet.updateNodeStatus(); err != nil {
t.Errorf("unexpected error: %v", err)
}
if len(kubeClient.Actions) != 2 || kubeClient.Actions[1].Action != "update-status-node" {
t.Fatalf("unexpected actions: %v", kubeClient.Actions)
actions := kubeClient.Actions()
if len(actions) != 2 || actions[1].Action != "update-status-node" {
t.Fatalf("unexpected actions: %v", actions)
}
updatedNode, ok := kubeClient.Actions[1].Value.(*api.Node)
updatedNode, ok := actions[1].Value.(*api.Node)
if !ok {
t.Errorf("unexpected object type")
}
@@ -2419,10 +2420,11 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
if err := kubelet.updateNodeStatus(); err != nil {
t.Errorf("unexpected error: %v", err)
}
if len(kubeClient.Actions) != 2 {
t.Errorf("unexpected actions: %v", kubeClient.Actions)
actions := kubeClient.Actions()
if len(actions) != 2 {
t.Errorf("unexpected actions: %v", actions)
}
updatedNode, ok := kubeClient.Actions[1].Value.(*api.Node)
updatedNode, ok := actions[1].Value.(*api.Node)
if !ok {
t.Errorf("unexpected object type")
}
@@ -2506,10 +2508,11 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) {
if err := kubelet.updateNodeStatus(); err != nil {
t.Errorf("unexpected error: %v", err)
}
if len(kubeClient.Actions) != 2 || kubeClient.Actions[1].Action != "update-status-node" {
t.Fatalf("unexpected actions: %v", kubeClient.Actions)
actions := kubeClient.Actions()
if len(actions) != 2 || actions[1].Action != "update-status-node" {
t.Fatalf("unexpected actions: %v", actions)
}
updatedNode, ok := kubeClient.Actions[1].Value.(*api.Node)
updatedNode, ok := actions[1].Value.(*api.Node)
if !ok {
t.Errorf("unexpected object type")
}
@@ -2536,8 +2539,8 @@ func TestUpdateNodeStatusError(t *testing.T) {
if err := kubelet.updateNodeStatus(); err == nil {
t.Errorf("unexpected non error: %v", err)
}
if len(testKubelet.fakeKubeClient.Actions) != nodeStatusUpdateRetry {
t.Errorf("unexpected actions: %v", testKubelet.fakeKubeClient.Actions)
if len(testKubelet.fakeKubeClient.Actions()) != nodeStatusUpdateRetry {
t.Errorf("unexpected actions: %v", testKubelet.fakeKubeClient.Actions())
}
}

2
pkg/kubelet/status_manager_test.go
View File

@@ -53,7 +53,7 @@ func getRandomPodStatus() api.PodStatus {
}
func verifyActions(t *testing.T, kubeClient client.Interface, expectedActions []string) {
actions := kubeClient.(*testclient.Fake).Actions
actions := kubeClient.(*testclient.Fake).Actions()
if len(actions) != len(expectedActions) {
t.Errorf("unexpected actions, got: %s expected: %s", actions, expectedActions)
return