@@ -36,15 +36,23 @@ func TestAuthProxyOnAuthorize(t *testing.T) {

 	testutil.RequireEtcd(t)

 	masterConfig, err := testserver.DefaultMasterOptions()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	masterConfig.OAuthConfig.IdentityProviders = []configapi.IdentityProvider{idp}

 	clusterAdminKubeConfig, err := testserver.StartConfiguredMasterAPI(masterConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	// set up a front proxy guarding the oauth server

 	proxyHTTPHandler := NewBasicAuthChallenger("TestRegistryAndServer", validUsers, NewXRemoteUserProxyingHandler(clusterAdminClientConfig.Host))

@@ -54,7 +62,9 @@ func TestAuthProxyOnAuthorize(t *testing.T) {

 	// need to prime clients so that we can get back a code.  the client must be valid

 	result := clusterAdminClient.RESTClient.Post().Resource("oAuthClients").Body(&oauthapi.OAuthClient{ObjectMeta: kapi.ObjectMeta{Name: "test"}, Secret: "secret", RedirectURIs: []string{clusterAdminClientConfig.Host}}).Do()

-	checkErr(t, result.Error())

+	if result.Error() != nil {

+		t.Fatal(result.Error())

+	}

 	// our simple URL to get back a code.  We want to go through the front proxy

 	rawAuthorizeRequest := proxyServer.URL + origin.OpenShiftOAuthAPIPrefix + "/authorize?response_type=code&client_id=test"

@@ -90,11 +90,15 @@ func TestConcurrentBuildControllers(t *testing.T) {

 	// Create a build

 	ns := testutil.Namespace()

 	b, err := osClient.Builds(ns).Create(mockBuild())

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	// Start watching builds for New -> Pending transition

 	buildWatch, err := osClient.Builds(ns).Watch(kapi.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name), ResourceVersion: b.ResourceVersion})

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	defer buildWatch.Stop()

 	buildModifiedCount := int32(0)

 	go func() {

@@ -118,7 +122,9 @@ func TestConcurrentBuildControllers(t *testing.T) {

 	// Watch build pods as they are created

 	podWatch, err := kClient.Pods(ns).Watch(kapi.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", buildapi.GetBuildPodName(b))})

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	defer podWatch.Stop()

 	podAddedCount := int32(0)

 	go func() {

@@ -206,16 +212,20 @@ func TestConcurrentBuildPodControllers(t *testing.T) {

 		// Create a build

 		b, err := osClient.Builds(ns).Create(mockBuild())

-		checkErr(t, err)

+		if err != nil {

+			t.Fatal(err)

+		}

 		// Watch build pod for transition to pending

 		podWatch, err := kClient.Pods(ns).Watch(kapi.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", buildapi.GetBuildPodName(b))})

-		checkErr(t, err)

+		if err != nil {

+			t.Fatal(err)

+		}

 		go func() {

 			for e := range podWatch.ResultChan() {

 				pod, ok := e.Object.(*kapi.Pod)

 				if !ok {

-					checkErr(t, fmt.Errorf("%s: unexpected object received: %#v\n", test.Name, e.Object))

+					t.Fatalf("%s: unexpected object received: %#v\n", test.Name, e.Object)

 				}

 				if pod.Status.Phase == kapi.PodPending {

 					podReadyChan <- pod

@@ -241,15 +251,26 @@ func TestConcurrentBuildPodControllers(t *testing.T) {

 		podWatch.Stop()

 		for _, state := range test.States {

-			// Update pod state and verify that corresponding build state happens accordingly

-			pod, err := kClient.Pods(ns).Get(pod.Name)

-			checkErr(t, err)

-			pod.Status.Phase = state.PodPhase

-			_, err = kClient.Pods(ns).UpdateStatus(pod)

-			checkErr(t, err)

+			if err := kclient.RetryOnConflict(kclient.DefaultRetry, func() error {

+				// Update pod state and verify that corresponding build state happens accordingly

+				pod, err := kClient.Pods(ns).Get(pod.Name)

+				if err != nil {

+					return err

+				}

+				if pod.Status.Phase == state.PodPhase {

+					return fmt.Errorf("another client altered the pod phase to %s: %#v", state.PodPhase, pod)

+				}

+				pod.Status.Phase = state.PodPhase

+				_, err = kClient.Pods(ns).UpdateStatus(pod)

+				return err

+			}); err != nil {

+				t.Fatal(err)

+			}

 			buildWatch, err := osClient.Builds(ns).Watch(kapi.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", b.Name), ResourceVersion: b.ResourceVersion})

-			checkErr(t, err)

+			if err != nil {

+				t.Fatal(err)

+			}

 			defer buildWatch.Stop()

 			go func() {

 				done := false

@@ -320,33 +341,37 @@ func TestConcurrentBuildConfigControllers(t *testing.T) {

 	runBuildConfigChangeControllerTest(t, osClient, kClient)

 }

-func checkErr(t *testing.T, err error) {

-	if err != nil {

-		t.Fatalf("unexpected error: %v", err)

-	}

-}

-

 func setupBuildControllerTest(counts controllerCount, t *testing.T) (*client.Client, *kclient.Client) {

 	testutil.RequireEtcd(t)

 	master, clusterAdminKubeConfig, err := testserver.StartTestMaster()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminKubeClient, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	_, err = clusterAdminKubeClient.Namespaces().Create(&kapi.Namespace{

 		ObjectMeta: kapi.ObjectMeta{Name: testutil.Namespace()},

 	})

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	if err := testserver.WaitForServiceAccounts(clusterAdminKubeClient, testutil.Namespace(), []string{bootstrappolicy.BuilderServiceAccountName, bootstrappolicy.DefaultServiceAccountName}); err != nil {

-		t.Errorf("unexpected error: %v", err)

+		t.Fatalf("unexpected error: %v", err)

 	}

 	openshiftConfig, err := origin.BuildMasterConfig(*master)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	// Get the build controller clients, since those rely on service account tokens

 	// We don't want to proceed with the rest of the test until those are available

@@ -16,9 +16,13 @@ import (

 func TestCLIGetToken(t *testing.T) {

 	testutil.RequireEtcd(t)

 	_, clusterAdminKubeConfig, err := testserver.StartTestMasterAPI()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	anonymousConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)

 	reader := bytes.NewBufferString("user\npass")

@@ -33,10 +37,14 @@ func TestCLIGetToken(t *testing.T) {

 	clientConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)

 	clientConfig.BearerToken = accessToken

 	osClient, err := client.New(&clientConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	user, err := osClient.Users().Get("~")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	if user.Name != "user" {

 		t.Errorf("expected %v, got %v", "user", user.Name)

@@ -30,7 +30,9 @@ func TestClusterResourceOverridePluginWithNoLimits(t *testing.T) {

 	// test with no limits object present

 	podCreated, err := podHandler.Create(testClusterResourceOverridePod("limitless", "2Gi", "1"))

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	if memory := podCreated.Spec.Containers[0].Resources.Requests.Memory(); memory.Cmp(resource.MustParse("1Gi")) != 0 {

 		t.Errorf("limitlesspod: Memory did not match expected 1Gi: %#v", memory)

 	}

@@ -69,9 +71,13 @@ func TestClusterResourceOverridePluginWithLimits(t *testing.T) {

 		Spec:       kapi.LimitRangeSpec{Limits: []kapi.LimitRangeItem{limitItem}},

 	}

 	_, err := limitHandler.Create(limit)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	podCreated, err := podHandler.Create(testClusterResourceOverridePod("limit-with-default", "", "1"))

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	if memory := podCreated.Spec.Containers[0].Resources.Limits.Memory(); memory.Cmp(resource.MustParse("512Mi")) != 0 {

 		t.Errorf("limit-with-default: Memory limit did not match default 512Mi: %v", memory)

 	}

@@ -96,7 +102,9 @@ func TestClusterResourceOverridePluginWithLimits(t *testing.T) {

 func setupClusterResourceOverrideTest(t *testing.T, pluginConfig *overrideapi.ClusterResourceOverrideConfig) kclient.Interface {

 	masterConfig, err := testserver.DefaultMasterOptions()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	// fill in possibly-empty config values

 	if masterConfig.KubernetesMasterConfig == nil {

 		masterConfig.KubernetesMasterConfig = &api.KubernetesMasterConfig{}

@@ -111,16 +119,26 @@ func setupClusterResourceOverrideTest(t *testing.T, pluginConfig *overrideapi.Cl

 	// start up a server and return useful clients to that server

 	clusterAdminKubeConfig, err := testserver.StartConfiguredMaster(masterConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminKubeClient, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	// need to create a project and return client for project admin

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	_, err = testserver.CreateNewProject(clusterAdminClient, *clusterAdminClientConfig, testutil.Namespace(), "peon")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	checkErr(t, testserver.WaitForServiceAccounts(clusterAdminKubeClient, testutil.Namespace(), []string{bootstrappolicy.DefaultServiceAccountName}))

 	return clusterAdminKubeClient

 }

@@ -20,15 +20,25 @@ func TestDeployScale(t *testing.T) {

 	testutil.RequireEtcd(t)

 	_, clusterAdminKubeConfig, err := testserver.StartTestMaster()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	_, err = testserver.CreateNewProject(clusterAdminClient, *clusterAdminClientConfig, namespace, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	osClient, _, _, err := testutil.GetClientForUser(*clusterAdminClientConfig, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	config := deploytest.OkDeploymentConfig(0)

 	config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{}

@@ -27,15 +27,25 @@ func TestTriggers_manual(t *testing.T) {

 	testutil.RequireEtcd(t)

 	_, clusterAdminKubeConfig, err := testserver.StartTestMaster()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	_, err = testserver.CreateNewProject(clusterAdminClient, *clusterAdminClientConfig, namespace, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	osClient, kubeClient, _, err := testutil.GetClientForUser(*clusterAdminClientConfig, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	config := deploytest.OkDeploymentConfig(0)

 	config.Namespace = namespace

@@ -346,15 +356,25 @@ func TestTriggers_configChange(t *testing.T) {

 	testutil.RequireEtcd(t)

 	_, clusterAdminKubeConfig, err := testserver.StartTestMaster()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClientConfig, err := testutil.GetClusterAdminClientConfig(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	_, err = testserver.CreateNewProject(clusterAdminClient, *clusterAdminClientConfig, namespace, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	osClient, kubeClient, _, err := testutil.GetClientForUser(*clusterAdminClientConfig, "my-test-user")

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	config := deploytest.OkDeploymentConfig(0)

 	config.Namespace = namespace

@@ -12,9 +12,13 @@ import (

 func TestNamespaceLifecycleAdmission(t *testing.T) {

 	testutil.RequireEtcd(t)

 	_, clusterAdminKubeConfig, err := testserver.StartTestMaster()

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	clusterAdminClient, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	for _, ns := range []string{"default", "openshift", "openshift-infra"} {

 		if err := clusterAdminClient.Namespaces().Delete(ns); err == nil {

@@ -1,5 +1,3 @@

-// +build integration,docker

-

 package router

 // These certificates are example certificates generated by a fake cert authority.

@@ -1,5 +1,3 @@

-// +build integration,docker

-

 package router

 import (

@@ -42,7 +42,9 @@ func TestWebhookGitHubPushWithImage(t *testing.T) {

 	}

 	clusterAdminKubeClient, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	if err := testserver.WaitForServiceAccounts(clusterAdminKubeClient, testutil.Namespace(), []string{bootstrappolicy.BuilderServiceAccountName, bootstrappolicy.DefaultServiceAccountName}); err != nil {

 		t.Errorf("unexpected error: %v", err)

@@ -137,7 +139,9 @@ func TestWebhookGitHubPushWithImageStream(t *testing.T) {

 	}

 	clusterAdminKubeClient, err := testutil.GetClusterAdminKubeClient(clusterAdminKubeConfig)

-	checkErr(t, err)

+	if err != nil {

+		t.Fatal(err)

+	}

 	err = testutil.CreateNamespace(clusterAdminKubeConfig, testutil.Namespace())

 	if err != nil {