Skip to content

Commit 56ac0bf

Browse files
committed
re-enable deployment test
1 parent 0ac4108 commit 56ac0bf

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

pkg/oc/cli/cmd/rollout/cancel.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,14 @@ func (o CancelOptions) Run() error {
136136
return runtime.Encode(o.Encoder, rc)
137137
})
138138

139-
if len(patches) == 0 {
139+
allPatchesEmpty := true
140+
for _, patch := range patches {
141+
if len(patch.Patch) > 0 {
142+
allPatchesEmpty = false
143+
break
144+
}
145+
}
146+
if allPatchesEmpty {
140147
kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already cancelled")
141148
return false
142149
}

test/extended/util/test.go

-2
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ var (
263263
// consistent 500 errors
264264
"should expose prometheus metrics for a route",
265265
"should expose the profiling endpoints",
266-
// super flaky
267-
"should only deploy the last deployment",
268266

269267
`\[Skipped\]`,
270268
`\[Slow\]`,

0 commit comments

Comments
 (0)