Skip to content

Commit

Permalink
Update nightly org deletion tests to account for bg job (#2118)
Browse files Browse the repository at this point in the history
Follow-up to #2098

Updates I missed to nightly org deletion tests following the shift to
deleting orgs in a background job. I think this should be the last thing
to get nightly tests passing consistently again.
tw4l authored Oct 30, 2024

Verified

This commit was signed with the committer’s verified signature.
GeekyEggo Richard Herman
1 parent 3ea20e5 commit 0dc025e
Showing 1 changed file with 90 additions and 6 deletions.
96 changes: 90 additions & 6 deletions backend/test_nightly/test_org_deletion.py
Original file line number Diff line number Diff line change
@@ -141,10 +141,38 @@ def test_delete_org_crawl_running(
f"{API_PREFIX}/orgs/{non_default_org_id}", headers=admin_auth_headers
)
assert r.status_code == 200
assert r.json()["deleted"]
data = r.json()
assert data["deleted"]

time.sleep(5)
job_id = data["id"]

# Check that background job is launched and eventually succeeds
max_attempts = 18
attempts = 1
while True:
try:
r = requests.get(
f"{API_PREFIX}/orgs/all/jobs/{job_id}", headers=admin_auth_headers
)
assert r.status_code == 200
success = r.json()["success"]

if success:
break

if success is False:
assert False

if attempts >= max_attempts:
assert False

time.sleep(10)
except:
pass

attempts += 1

# Check that org was deleted
r = requests.get(f"{API_PREFIX}/orgs", headers=admin_auth_headers)
data = r.json()
for org in data["items"]:
@@ -159,10 +187,38 @@ def test_delete_org_qa_running(
f"{API_PREFIX}/orgs/{non_default_org_id}", headers=admin_auth_headers
)
assert r.status_code == 200
assert r.json()["deleted"]
data = r.json()
assert data["deleted"]

time.sleep(5)
job_id = data["id"]

# Check that background job is launched and eventually succeeds
max_attempts = 18
attempts = 1
while True:
try:
r = requests.get(
f"{API_PREFIX}/orgs/all/jobs/{job_id}", headers=admin_auth_headers
)
assert r.status_code == 200
success = r.json()["success"]

if success:
break

if success is False:
assert False

if attempts >= max_attempts:
assert False

time.sleep(10)
except:
pass

attempts += 1

# Check that org was deleted
r = requests.get(f"{API_PREFIX}/orgs", headers=admin_auth_headers)
data = r.json()
for org in data["items"]:
@@ -177,10 +233,38 @@ def test_delete_org_profile_running(
f"{API_PREFIX}/orgs/{non_default_org_id}", headers=admin_auth_headers
)
assert r.status_code == 200
assert r.json()["deleted"]
data = r.json()
assert data["deleted"]

time.sleep(5)
job_id = data["id"]

# Check that background job is launched and eventually succeeds
max_attempts = 18
attempts = 1
while True:
try:
r = requests.get(
f"{API_PREFIX}/orgs/all/jobs/{job_id}", headers=admin_auth_headers
)
assert r.status_code == 200
success = r.json()["success"]

if success:
break

if success is False:
assert False

if attempts >= max_attempts:
assert False

time.sleep(10)
except:
pass

attempts += 1

# Check that org was deleted
r = requests.get(f"{API_PREFIX}/orgs", headers=admin_auth_headers)
data = r.json()
for org in data["items"]:

0 comments on commit 0dc025e

Please sign in to comment.