From 0ac41089e6797e0298145f26d1a9a1d8872c0050 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Thu, 14 Dec 2017 07:54:10 -0500
Subject: [PATCH 1/2] Revert "increase DC hook timeouts.  indicates pod start
 latency problem and flakes end-to-end"

This reverts commit b374cbdf048f21f81be8cc3129fa361d3454083c.
---
 test/testdata/failing-dc-mid.yaml | 2 +-
 test/testdata/failing-dc.yaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/testdata/failing-dc-mid.yaml b/test/testdata/failing-dc-mid.yaml
index 6830034a1965..d4bedf8f0b8c 100644
--- a/test/testdata/failing-dc-mid.yaml
+++ b/test/testdata/failing-dc-mid.yaml
@@ -9,7 +9,7 @@ spec:
   strategy:
     type: Recreate
     recreateParams:
-      timeoutSeconds: 40
+      timeoutSeconds: 20
       mid:
         failurePolicy: Abort
         execNewPod:
diff --git a/test/testdata/failing-dc.yaml b/test/testdata/failing-dc.yaml
index 648a5ca14f4f..84923e0d369d 100644
--- a/test/testdata/failing-dc.yaml
+++ b/test/testdata/failing-dc.yaml
@@ -15,7 +15,7 @@ spec:
       intervalSeconds: 1
       maxSurge: 25%
       maxUnavailable: 25%
-      timeoutSeconds: 40
+      timeoutSeconds: 5
       updatePeriodSeconds: 1
       pre:
         failurePolicy: Abort

From 56ac0bfb78be7f1f3cb8d48b6f3b9d6b077b5883 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Wed, 13 Dec 2017 14:02:54 -0500
Subject: [PATCH 2/2] re-enable deployment test

---
 pkg/oc/cli/cmd/rollout/cancel.go | 9 ++++++++-
 test/extended/util/test.go       | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkg/oc/cli/cmd/rollout/cancel.go b/pkg/oc/cli/cmd/rollout/cancel.go
index d9c61c549cd8..a5fcba5470b3 100644
--- a/pkg/oc/cli/cmd/rollout/cancel.go
+++ b/pkg/oc/cli/cmd/rollout/cancel.go
@@ -136,7 +136,14 @@ func (o CancelOptions) Run() error {
 				return runtime.Encode(o.Encoder, rc)
 			})
 
-			if len(patches) == 0 {
+			allPatchesEmpty := true
+			for _, patch := range patches {
+				if len(patch.Patch) > 0 {
+					allPatchesEmpty = false
+					break
+				}
+			}
+			if allPatchesEmpty {
 				kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already cancelled")
 				return false
 			}
diff --git a/test/extended/util/test.go b/test/extended/util/test.go
index 19530eb96171..6001989f4fb8 100644
--- a/test/extended/util/test.go
+++ b/test/extended/util/test.go
@@ -263,8 +263,6 @@ var (
 		// consistent 500 errors
 		"should expose prometheus metrics for a route",
 		"should expose the profiling endpoints",
-		// super flaky
-		"should only deploy the last deployment",
 
 		`\[Skipped\]`,
 		`\[Slow\]`,