Fix client-go fake client example flake

Kubernetes-commit: 0b116d915f12181e36f02ed3a87767513074e270
This commit is contained in:
Tomas Nozicka 2019-03-06 08:36:15 +01:00 committed by Kubernetes Publisher
parent 2aaf7914a0
commit 1abd19a10b

View File

@ -23,6 +23,7 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
@ -30,8 +31,8 @@ import (
// TestFakeClient demonstrates how to use a fake client with SharedInformerFactory in tests. // TestFakeClient demonstrates how to use a fake client with SharedInformerFactory in tests.
func TestFakeClient(t *testing.T) { func TestFakeClient(t *testing.T) {
// Use a timeout to keep the test from hanging. ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel()
// Create the fake client. // Create the fake client.
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
@ -45,7 +46,6 @@ func TestFakeClient(t *testing.T) {
pod := obj.(*v1.Pod) pod := obj.(*v1.Pod)
t.Logf("pod added: %s/%s", pod.Namespace, pod.Name) t.Logf("pod added: %s/%s", pod.Namespace, pod.Name)
pods <- pod pods <- pod
cancel()
}, },
}) })
@ -55,23 +55,19 @@ func TestFakeClient(t *testing.T) {
// This is not required in tests, but it serves as a proof-of-concept by // This is not required in tests, but it serves as a proof-of-concept by
// ensuring that the informer goroutine have warmed up and called List before // ensuring that the informer goroutine have warmed up and called List before
// we send any events to it. // we send any events to it.
for !podInformer.HasSynced() { cache.WaitForCacheSync(ctx.Done(), podInformer.HasSynced)
time.Sleep(10 * time.Millisecond)
}
// Inject an event into the fake client. // Inject an event into the fake client.
p := &v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "my-pod"}} p := &v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "my-pod"}}
_, err := client.CoreV1().Pods("test-ns").Create(p) _, err := client.CoreV1().Pods("test-ns").Create(p)
if err != nil { if err != nil {
t.Errorf("error injecting pod add: %v", err) t.Fatalf("error injecting pod add: %v", err)
} }
// Wait and check result.
<-ctx.Done()
select { select {
case pod := <-pods: case pod := <-pods:
t.Logf("Got pod from channel: %s/%s", pod.Namespace, pod.Name) t.Logf("Got pod from channel: %s/%s", pod.Namespace, pod.Name)
default: case <-time.After(wait.ForeverTestTimeout):
t.Error("Informer did not get the added pod") t.Error("Informer did not get the added pod")
} }
} }