Skip to content

Commit

Permalink
test(e2e): increase eventually time (backport of #12099) (#12114)
Browse files Browse the repository at this point in the history
Automatic cherry-pick of #12099 for branch release-2.7

Generated by
[action](https://github.com/kumahq/kuma/actions/runs/12045725937)

cherry-picked commit fa008d1
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!
⚠️ ⚠️ ⚠️
```
On branch release-2.7
Your branch is up to date with 'origin/release-2.7'.

You are currently cherry-picking commit fa008d1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e_env/universal/meshretry/http.go

no changes added to commit (use "git add" and/or "git commit -a")
```

---------

Signed-off-by: Lukasz Dziedziak <[email protected]>
Co-authored-by: Lukasz Dziedziak <[email protected]>
  • Loading branch information
kumahq[bot] and lukidzi authored Nov 27, 2024
1 parent a44ec81 commit 2270789
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions test/e2e_env/universal/meshretry/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,16 @@ spec:
universal.Cluster, "demo-client", "test-server.mesh",
)
g.Expect(err).ToNot(HaveOccurred())
}, "10s", "100ms", MustPassRepeatedly(5)).Should(Succeed())
}, "30s", "100ms", MustPassRepeatedly(5)).Should(Succeed())

By("Adding a MeshFaultInjection for test-server")
Expect(universal.Cluster.Install(YamlUniversal(meshFaultInjection))).To(Succeed())

// Increased the time to 30 seconds
// reference: https://github.com/kumahq/kuma/issues/12098
// The default `initial_fetch_timeout` is 15 seconds.
// In case the race condition described in the issue occurs,
// this provides enough time to validate whether the change has arrived.
By("Check some errors happen")
Eventually(func(g Gomega) {
response, err := client.CollectFailure(
Expand All @@ -101,7 +106,7 @@ spec:

g.Expect(err).ToNot(HaveOccurred())
g.Expect(response.ResponseCode).To(Equal(500))
}, "10s", "100ms").Should(Succeed())
}, "30s", "100ms").Should(Succeed())

By("Apply a MeshRetry policy")
Expect(universal.Cluster.Install(YamlUniversal(meshRetryPolicy))).To(Succeed())
Expand Down Expand Up @@ -181,7 +186,7 @@ spec:
universal.Cluster, "demo-client", "test-server.mesh",
)
g.Expect(err).ToNot(HaveOccurred())
}, "10s", "100ms", MustPassRepeatedly(5)).Should(Succeed())
}, "30s", "100ms", MustPassRepeatedly(5)).Should(Succeed())

By("Adding a MeshFaultInjection for test-server")
Expect(universal.Cluster.Install(YamlUniversal(meshFaultInjection))).To(Succeed())
Expand All @@ -196,7 +201,7 @@ spec:

g.Expect(err).ToNot(HaveOccurred())
g.Expect(response.ResponseCode).To(Equal(500))
}, "10s", "100ms").Should(Succeed())
}, "30s", "100ms").Should(Succeed())

By("Apply a MeshRetry policy")
Expect(universal.Cluster.Install(YamlUniversal(meshRetryPolicy))).To(Succeed())
Expand Down

0 comments on commit 2270789

Please sign in to comment.