@@ -4,12 +4,13 @@ package integration

 import (

 	"testing"

+	"time"

-	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/apis/extensions"

+	"k8s.io/kubernetes/pkg/util/wait"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 	testutil "github.com/openshift/origin/test/util"

 	testserver "github.com/openshift/origin/test/util/server"

 )

@@ -38,6 +39,17 @@ func TestDeployScale(t *testing.T) {

 		t.Fatalf("Couldn't create DeploymentConfig: %v %#v", err, config)

 	}

+	condition := func() (bool, error) {

+		config, err := osClient.DeploymentConfigs(namespace).Get(dc.Name)

+		if err != nil {

+			return false, nil

+		}

+		return deployutil.HasSynced(config), nil

+	}

+	if err := wait.PollImmediate(500*time.Millisecond, 10*time.Second, condition); err != nil {

+		t.Fatalf("Deployment config never synced: %v", err)

+	}

+

 	scale, err := osClient.DeploymentConfigs(namespace).GetScale(config.Name)

 	if err != nil {

 		t.Fatalf("Couldn't get DeploymentConfig scale: %v", err)

@@ -46,13 +58,9 @@ func TestDeployScale(t *testing.T) {

 		t.Fatalf("Expected scale.spec.replicas=1, got %#v", scale)

 	}

-	scaleUpdate := &extensions.Scale{

-		ObjectMeta: kapi.ObjectMeta{

-			Name:      dc.Name,

-			Namespace: namespace,

-		},

-		Spec: extensions.ScaleSpec{Replicas: 3},

-	}

+	scaleUpdate := deployapi.ScaleFromConfig(dc)

+	scaleUpdate.Spec.Replicas = 3

+

 	updatedScale, err := osClient.DeploymentConfigs(namespace).UpdateScale(scaleUpdate)

 	if err != nil {

 		// If this complains about "Scale" not being registered in "v1", check the kind overrides in the API registration in SubresourceGroupVersionKind