pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More test cleanup

Browse Source
This commit is contained in:
richard-dds 2019-09-17 11:47:06 -04:00
parent 7004f7d37e
commit 68ac7aecdf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_jobs.py
View File

@ -227,14 +227,19 @@ def test_create_environment_no_dupes(session, celery_app, celery_worker):
) )
environment = portfolio.applications[0].environments[0] environment = portfolio.applications[0].environments[0]
# create_environment is run twice on the same environment
create_environment.run(environment_id=environment.id) create_environment.run(environment_id=environment.id)
environment = session.query(Environment).get(environment.id) session.refresh(environment)
first_cloud_id = environment.cloud_id first_cloud_id = environment.cloud_id
create_environment.run(environment_id=environment.id) create_environment.run(environment_id=environment.id)
environment = session.query(Environment).get(environment.id) session.refresh(environment)
# The environment's cloud_id was not overwritten in the second run
assert environment.cloud_id == first_cloud_id assert environment.cloud_id == first_cloud_id
# The environment's claim was released
assert environment.claimed_until == None assert environment.claimed_until == None
@ -267,7 +272,7 @@ def test_claim_for_update(session):
satisfied_claims = [] satisfied_claims = []
# Two threads that race to acquire a claim on the same environment. # Two threads that race to acquire a claim on the same environment.
# SecondThread's claim will be rejected, which will result in a ClaimFailedException. # SecondThread's claim will be rejected, resulting in a ClaimFailedException.
class FirstThread(Thread): class FirstThread(Thread):
def run(self): def run(self):
with claim_for_update(environment): with claim_for_update(environment):
@ -293,5 +298,5 @@ def test_claim_for_update(session):
# Only FirstThread acquired a claim and wrote to satisfied_claims # Only FirstThread acquired a claim and wrote to satisfied_claims
assert satisfied_claims == ["FirstThread"] assert satisfied_claims == ["FirstThread"]
# The claim is released as soon as work is done # The claim is released
assert environment.claimed_until is None assert environment.claimed_until is None