From dd7f806c73296fae9815b4915fd4fe3cc48b3c8b Mon Sep 17 00:00:00 2001 From: Georgi Sabev Date: Mon, 11 Dec 2023 10:08:13 +0000 Subject: [PATCH] Delete domain test waits for the deletion job It is incorrect to perform checks on domain routes while the domain is being deleted. Co-authored-by: Danail Branekov --- tests/e2e/domains_test.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/e2e/domains_test.go b/tests/e2e/domains_test.go index a347a1913..edfbd30e1 100644 --- a/tests/e2e/domains_test.go +++ b/tests/e2e/domains_test.go @@ -158,9 +158,7 @@ var _ = Describe("Domain", func() { resp, err = adminClient.R(). Delete("/v3/domains/" + domainGUID) Expect(err).NotTo(HaveOccurred()) - }) - It("succeeds with a job redirect", func() { Expect(resp).To(SatisfyAll( HaveRestyStatusCode(http.StatusAccepted), HaveRestyHeaderWithValue("Location", HaveSuffix("/v3/jobs/domain.delete~"+domainGUID)), @@ -173,7 +171,9 @@ var _ = Describe("Domain", func() { g.Expect(err).NotTo(HaveOccurred()) g.Expect(string(resp.Body())).To(ContainSubstring("COMPLETE")) }).Should(Succeed()) + }) + It("deletes the domain", func() { getDomainResp, err := adminClient.R().Get("/v3/domains/" + domainGUID) Expect(err).NotTo(HaveOccurred()) Expect(getDomainResp).To(HaveRestyStatusCode(http.StatusNotFound)) @@ -204,15 +204,13 @@ var _ = Describe("Domain", func() { }) It("deletes the domain routes", func() { - Eventually(func(g Gomega) { - var routes resourceList[responseResource] - listRoutesResp, err := adminClient.R(). - SetResult(&routes). - Get("/v3/routes?space_guids=" + spaceGUID) - g.Expect(err).NotTo(HaveOccurred()) - g.Expect(listRoutesResp).To(HaveRestyStatusCode(http.StatusOK)) - g.Expect(routes.Resources).To(BeEmpty()) - }).Should(Succeed()) + var routes resourceList[responseResource] + listRoutesResp, err := adminClient.R(). + SetResult(&routes). + Get("/v3/routes?space_guids=" + spaceGUID) + Expect(err).NotTo(HaveOccurred()) + Expect(listRoutesResp).To(HaveRestyStatusCode(http.StatusOK)) + Expect(routes.Resources).To(BeEmpty()) }) }) })