@@ -38,6 +38,7 @@ var _ = g.Describe("deploymentconfigs", func() {

 		minReadySecondsFixture          = exutil.FixturePath("testdata", "deployment-min-ready-seconds.yaml")

 		multipleICTFixture              = exutil.FixturePath("testdata", "deployment-example.yaml")

 		tagImagesFixture                = exutil.FixturePath("testdata", "tag-images-deployment.yaml")

+		readinessFixture                = exutil.FixturePath("testdata", "readiness-test.yaml")

 	)

 	g.Describe("when run iteratively", func() {

@@ -619,6 +620,21 @@ var _ = g.Describe("deploymentconfigs", func() {

 		})

 	})

+	g.Describe("initially", func() {

+		g.AfterEach(func() {

+			failureTrap(oc, "readiness", g.CurrentGinkgoTestDescription().Failed)

+		})

+

+		g.It("should not deploy if pods never transition to ready [Conformance]", func() {

+			_, name, err := createFixture(oc, readinessFixture)

+			o.Expect(err).NotTo(o.HaveOccurred())

+

+			g.By("waiting for the deployment to fail")

+			err = waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentFailed)

+			o.Expect(err).NotTo(o.HaveOccurred())

+		})

+	})

+

 	g.Describe("with revision history limits", func() {

 		g.AfterEach(func() {

 			failureTrap(oc, "history-limit", g.CurrentGinkgoTestDescription().Failed)

@@ -189,6 +189,18 @@ func deploymentReachedCompletion(dc *deployapi.DeploymentConfig, rcs []kapi.Repl

 	return true, nil

 }

+func deploymentFailed(dc *deployapi.DeploymentConfig, rcs []kapi.ReplicationController, _ []kapi.Pod) (bool, error) {

+	if len(rcs) == 0 {

+		return false, nil

+	}

+	rc := rcs[len(rcs)-1]

+	version := deployutil.DeploymentVersionFor(&rc)

+	if version != dc.Status.LatestVersion {

+		return false, nil

+	}

+	return deployutil.IsFailedDeployment(&rc), nil

+}

+

 func deploymentRunning(dc *deployapi.DeploymentConfig, rcs []kapi.ReplicationController, pods []kapi.Pod) (bool, error) {

 	if len(rcs) == 0 {

 		return false, nil

new file mode 100644

@@ -0,0 +1,27 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: readiness

+spec:

+  replicas: 1

+  strategy:

+    rollingParams:

+      timeoutSeconds: 30

+    type: Rolling

+  template:

+    metadata:

+      labels:

+        name: readiness-test

+    spec:

+      containers:

+      - command:

+        - /bin/sleep

+        - "10000"

+        image: docker.io/centos:centos7

+        imagePullPolicy: IfNotPresent

+        name: never-ready

+        readinessProbe:

+          exec:

+            command:

+            - /bin/false

+          failureThreshold: 1