More rebase fixes

Author: mfojtik

hack/test-integration.sh

@@ -15,7 +15,7 @@ os::build::setup_env
 
 function cleanup()
 {
-  [ ! -z "${ETCD_STARTED}" ] && return
+  [ ! -z "${ETCD_STARTED-}" ] && return
   set +e
   kill ${ETCD_PID} 1>&2 2>/dev/null
   rm -rf ${ETCD_DIR} 1>&2 2>/dev/null
@@ -45,6 +45,7 @@ CGO_ENABLED=0 go test -c -tags="${tags}" "${OS_GO_PACKAGE}/${package}"
 popd 2>&1 >/dev/null
 
 start_etcd
+trap cleanup EXIT SIGINT
 
 function exectest() {
   echo "Running $1..."

test/integration/bootstrap_policy_test.go

@@ -79,7 +79,7 @@ func TestOverwritePolicyCommand(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	client, _, _, err := util.GetClusterAdminClient(clusterAdminKubeConfig)
+	client, err := util.GetClusterAdminClient(clusterAdminKubeConfig)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}

test/integration/login_test.go

@@ -29,12 +29,12 @@ func TestLogin(t *testing.T) {
 
 	clusterAdminClient, err := util.GetClusterAdminClient(clusterAdminKubeConfig)
 	if err != nil {
-		t.Errorf("unexpected error: %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	clusterAdminClientConfig, err := util.GetClusterAdminClientConfig(clusterAdminKubeConfig)
 	if err != nil {
-		t.Errorf("unexpected error: %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	// empty config, should display message

test/integration/oauth_request_header_test.go

@@ -112,7 +112,7 @@ func TestOAuthRequestHeader(t *testing.T) {
 
 	clientConfig, err := util.GetClusterAdminClientConfig(clusterAdminKubeConfig)
 	if err != nil {
-		t.Errorf("unexpected error: %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	// Use the server and CA info, but no client cert info

test/util/helpers.go

@@ -32,7 +32,7 @@ func CreateSampleImageRepository(namespace string) *imageapi.ImageRepository {
 // namespace
 func DeleteSampleImageRepository(repo *imageapi.ImageRepository, namespace string) {
 	client, _ := GetClusterAdminClient(KubeConfigPath())
-	result, err := client.ImageRepositories(namespace).Delete(repo)
+	client.ImageRepositories(namespace).Delete(repo.Name)
 }
 
 // GetBuildFixture reads the Build JSON and returns and Build object

test/util/server.go

@@ -71,7 +71,7 @@ func setupStartOptions() (*start.MasterArgs, *start.NodeArgs, *start.ListenArg,
 
 	dnsAddr := httptest.NewUnstartedServer(nil).Listener.Addr().String()
 	if len(os.Getenv("OS_DNS_ADDR")) > 0 {
-		assetAddr = os.Getenv("OS_DNS_ADDR")
+		dnsAddr = os.Getenv("OS_DNS_ADDR")
 	}
 	fmt.Printf("dnsAddr: %#v\n", dnsAddr)
 	masterArgs.DNSBindAddr.Set(dnsAddr)