Merge pull request #31874 from wojtek-t/fix_service_alloc

Automatic merge from submit-queue Fix TestServiceAlloc flake Fix #31850 This bug was introduced in https://github.com/kubernetes/kubernetes/pull/31756 @lavalamp @smarterclayton - FYI ^^

Merge pull request #31874 from wojtek-t/fix_service_alloc
164eebe3 · Kubernetes Submit Queue · GitHub · f6eb2876 · 41518feb · 164eebe3
Commit 164eebe3 authored Sep 01, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

master_test.go test/integration/master/master_test.go +12 -0

No files found.
--- a/test/integration/master/master_test.go
+++ b/test/integration/master/master_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/ghodss/yaml"

 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
 	"k8s.io/kubernetes/pkg/client/restclient"
@@ -442,6 +443,17 @@ func TestServiceAlloc(t *testing.T) {
 		}
 	}

+	// Wait until the default "kubernetes" service is created.
+	if err = wait.Poll(250*time.Millisecond, time.Minute, func() (bool, error) {
+		_, err := client.Services(api.NamespaceDefault).Get("kubernetes")
+		if err != nil && !errors.IsNotFound(err) {
+			return false, err
+		}
+		return !errors.IsNotFound(err), nil
+	}); err != nil {
+		t.Fatalf("creating kubernetes service timed out")
+	}
+
 	// Make a service.
 	if _, err := client.Services(api.NamespaceDefault).Create(svc(1)); err != nil {
 		t.Fatalf("got unexpected error: %v", err)