github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41257 from spxtr/flaky

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41342, 41257)

Move two flaky e2e tests to the flaky suite.

cc @kargakis @davidopp 

We should have moved these a long time ago.
**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-13 23:07:07 -08:00 committed by GitHub
commit c13eb9b259
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/deployment.go
View File

@ -95,7 +95,8 @@ var _ = framework.KubeDescribe("Deployment", func() {
It("overlapping deployment should not fight with each other", func() { It("overlapping deployment should not fight with each other", func() {
testOverlappingDeployment(f) testOverlappingDeployment(f)
}) })
It("lack of progress should be reported in the deployment status", func() { // Flaky issue #39785.
It("lack of progress should be reported in the deployment status [Flaky]", func() {
testFailedDeployment(f) testFailedDeployment(f)
}) })
It("iterative rollouts should eventually progress", func() { It("iterative rollouts should eventually progress", func() {

3
test/e2e/pods.go
View File

@ -45,7 +45,8 @@ var _ = framework.KubeDescribe("Pods Extended", func() {
BeforeEach(func() { BeforeEach(func() {
podClient = f.PodClient() podClient = f.PodClient()
}) })
It("should be submitted and removed [Conformance]", func() { // Flaky issue #36821.
It("should be submitted and removed [Conformance] [Flaky]", func() {
By("creating the pod") By("creating the pod")
name := "pod-submit-remove-" + string(uuid.NewUUID()) name := "pod-submit-remove-" + string(uuid.NewUUID())
value := strconv.Itoa(time.Now().Nanosecond()) value := strconv.Itoa(time.Now().Nanosecond())