attempt to fix flaky test

Signed-off-by: Soule BA <bah.soule@gmail.com>
fluxcd · Jan 22, 2024 · 1fef9e9 · 1fef9e9
1 parent c39f2dd
commit 1fef9e9
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/gitea/integration_repositories_user_test.go b/gitea/integration_repositories_user_test.go
@@ -299,7 +299,17 @@ var _ = Describe("Gitea Provider", func() {
  Expect(pr.Get().WebURL).ToNot(BeEmpty())
  Expect(pr.Get().Merged).To(BeFalse())
 
- err = userRepo.PullRequests().Merge(ctx, pr.Get().Number, gitprovider.MergeMethodMerge, "merged")
+ Eventually(func() bool {
+ var err error
+ getPR, err = userRepo.PullRequests().Get(ctx, pr.Get().Number)
+ pr := getPR.APIObject().(*gitea.PullRequest)
+ if err != nil || !pr.Mergeable {
+ err = errors.New("pull request not ready to merge")
+ }
+ return retryOp.IsRetryable(err, fmt.Sprintf("get pull request, repository: %s", userRepo.Repository().GetRepository()))
+ }, retryOp.Timeout(), retryOp.Interval()).Should(BeTrue())
+
+ err = userRepo.PullRequests().Merge(ctx, getPR.Get().Number, gitprovider.MergeMethodMerge, "merged")
  Expect(err).ToNot(HaveOccurred())
 
  getPR, err = userRepo.PullRequests().Get(ctx, pr.Get().Number)