Skip to content

Commit

Permalink
refctor tests naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcrespov
pcrespov committed Apr 9, 2022
1 parent 0fcf8d9 commit c01eb9f
Showing 1 changed file with 42 additions and 42 deletions.
84 changes: 42 additions & 42 deletions services/web/server/tests/integration/01/test_garbage_collection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def assert_dicts_match_by_common_keys(first_dict, second_dict):
assert first_dict[key] == second_dict[key], key


async def query_user_from_db(aiopg_engine: aiopg.sa.Engine, user: UserInfoDict):
async def fetch_user_from_db(aiopg_engine: aiopg.sa.Engine, user: UserInfoDict):
"""returns a user from the db"""
async with aiopg_engine.acquire() as conn:
user_result = await conn.execute(
Expand All @@ -310,18 +310,18 @@ async def query_user_from_db(aiopg_engine: aiopg.sa.Engine, user: UserInfoDict):
return await user_result.first()


async def query_project_from_db(aiopg_engine: aiopg.sa.Engine, user_project: Dict):
async def fetch_project_from_db(aiopg_engine: aiopg.sa.Engine, user_project: Dict):
async with aiopg_engine.acquire() as conn:
project_result = await conn.execute(
projects.select().where(projects.c.uuid == user_project["uuid"])
)
return await project_result.first()


async def assert_user_in_database(
async def assert_user_in_db(
aiopg_engine: aiopg.sa.Engine, logged_user: UserInfoDict
) -> bool:
user = await query_user_from_db(aiopg_engine, logged_user)
user = await fetch_user_from_db(aiopg_engine, logged_user)
user_as_dict = dict(user)

# some values need to be transformed
Expand All @@ -336,16 +336,16 @@ async def assert_user_in_database(
async def assert_user_not_in_database(
aiopg_engine: aiopg.sa.Engine, user: UserInfoDict
) -> bool:
user_db = await query_user_from_db(aiopg_engine, user)
user_db = await fetch_user_from_db(aiopg_engine, user)
assert user_db is None

return True


async def assert_project_in_database(
async def assert_project_in_db(
aiopg_engine: aiopg.sa.Engine, user_project: Dict
) -> bool:
project = await query_project_from_db(aiopg_engine, user_project)
project = await fetch_project_from_db(aiopg_engine, user_project)
project_as_dict = dict(project)

assert_dicts_match_by_common_keys(project_as_dict, user_project)
Expand All @@ -356,8 +356,8 @@ async def assert_project_in_database(
async def assert_user_is_owner_of_project(
aiopg_engine: aiopg.sa.Engine, owner_user: UserInfoDict, owner_project: Dict
) -> bool:
user = await query_user_from_db(aiopg_engine, owner_user)
project = await query_project_from_db(aiopg_engine, owner_project)
user = await fetch_user_from_db(aiopg_engine, owner_user)
project = await fetch_project_from_db(aiopg_engine, owner_project)

assert user.id == project.prj_owner

Expand All @@ -368,9 +368,9 @@ async def assert_one_owner_for_project(
aiopg_engine: aiopg.sa.Engine, project: Dict, possible_owners: List[UserInfoDict]
) -> bool:
q_owners = [
await query_user_from_db(aiopg_engine, owner) for owner in possible_owners
await fetch_user_from_db(aiopg_engine, owner) for owner in possible_owners
]
q_project = await query_project_from_db(aiopg_engine, project)
q_project = await fetch_project_from_db(aiopg_engine, project)

assert q_project.prj_owner in set([x.id for x in q_owners])

Expand Down Expand Up @@ -409,8 +409,8 @@ async def test_t1_while_guest_is_connected_no_resources_are_removed(
await asyncio.sleep(SERVICE_DELETION_DELAY + 1)
await garbage_collector_core.collect_garbage(app=client.app)

await assert_user_in_database(aiopg_engine, logged_guest_user)
assert await assert_project_in_database(aiopg_engine, empty_guest_user_project)
await assert_user_in_db(aiopg_engine, logged_guest_user)
await assert_project_in_db(aiopg_engine, empty_guest_user_project)


async def test_t2_cleanup_resources_after_browser_is_closed(
Expand All @@ -437,8 +437,8 @@ async def test_t2_cleanup_resources_after_browser_is_closed(
await garbage_collector_core.collect_garbage(app=client.app)

# check user and project are still in the DB
await assert_user_in_database(aiopg_engine, logged_guest_user)
assert await assert_project_in_database(aiopg_engine, empty_guest_user_project)
await assert_user_in_db(aiopg_engine, logged_guest_user)
await assert_project_in_db(aiopg_engine, empty_guest_user_project)

await disconnect_user_from_socketio(client, sio_connection_data)
await asyncio.sleep(SERVICE_DELETION_DELAY + 1)
Expand Down Expand Up @@ -485,11 +485,11 @@ async def test_t3_gc_will_not_intervene_for_regular_users_and_their_resources(

async def assert_projects_and_users_are_present():
# check user and projects and templates are still in the DB
await assert_user_in_database(aiopg_engine, logged_user)
await assert_user_in_db(aiopg_engine, logged_user)
for project in user_projects:
await assert_project_in_database(aiopg_engine, project)
await assert_project_in_db(aiopg_engine, project)
for template in user_template_projects:
await assert_project_in_database(aiopg_engine, template)
await assert_project_in_db(aiopg_engine, template)

await assert_users_count(aiopg_engine, 1)
expected_count = number_of_projects + number_of_templates
Expand Down Expand Up @@ -564,8 +564,8 @@ async def test_t5_project_shared_with_other_users_transferred_to_one_of_them(
u2 = await login_user(client)
u3 = await login_user(client)

q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)

# u1 creates project and shares it with g1
project = await new_project(
Expand Down Expand Up @@ -634,9 +634,9 @@ async def test_t6_project_shared_with_group_transferred_to_last_user_in_group_on
await assert_one_owner_for_project(aiopg_engine, project, [u2, u3])

# find new owner and mark hims as GUEST
q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_project = await query_project_from_db(aiopg_engine, project)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)
q_project = await fetch_project_from_db(aiopg_engine, project)

new_owner = None
remaining_others = []
Expand All @@ -654,7 +654,7 @@ async def test_t6_project_shared_with_group_transferred_to_last_user_in_group_on

# expected outcome: the new_owner will be deleted and one of the remainint_others wil be the new owner
await assert_user_not_in_database(aiopg_engine, new_owner)
assert await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_one_owner_for_project(aiopg_engine, project, remaining_others)


async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_last_and_all_is_removed(
Expand Down Expand Up @@ -701,9 +701,9 @@ async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_l
await assert_one_owner_for_project(aiopg_engine, project, [u2, u3])

# find new owner and mark hims as GUEST
q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_project = await query_project_from_db(aiopg_engine, project)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)
q_project = await fetch_project_from_db(aiopg_engine, project)

new_owner = None
remaining_others = []
Expand All @@ -721,7 +721,7 @@ async def test_t7_project_shared_with_group_transferred_from_one_member_to_the_l

# expected outcome: the new_owner will be deleted and one of the remainint_others wil be the new owner
await assert_user_not_in_database(aiopg_engine, new_owner)
assert await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_one_owner_for_project(aiopg_engine, project, remaining_others)

# only 1 user is left as the owner mark him as GUEST
for user in remaining_others:
Expand Down Expand Up @@ -749,8 +749,8 @@ async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_unt
u2 = await login_user(client)
u3 = await login_user(client)

q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)

# u1 creates project and shares it with g1
project = await new_project(
Expand All @@ -777,9 +777,9 @@ async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_unt
await assert_one_owner_for_project(aiopg_engine, project, [u2, u3])

# find new owner and mark hims as GUEST
q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_project = await query_project_from_db(aiopg_engine, project)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)
q_project = await fetch_project_from_db(aiopg_engine, project)

new_owner = None
remaining_others = []
Expand All @@ -797,7 +797,7 @@ async def test_t8_project_shared_with_other_users_transferred_to_one_of_them_unt

# expected outcome: the new_owner will be deleted and one of the remainint_others wil be the new owner
await assert_user_not_in_database(aiopg_engine, new_owner)
assert await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_users_count(aiopg_engine, 1)
await assert_projects_count(aiopg_engine, 1)

Expand All @@ -818,8 +818,8 @@ async def test_t9_project_shared_with_other_users_transferred_between_them_and_t
u2 = await login_user(client)
u3 = await login_user(client)

q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)

# u1 creates project and shares it with g1
project = await new_project(
Expand All @@ -846,9 +846,9 @@ async def test_t9_project_shared_with_other_users_transferred_between_them_and_t
await assert_one_owner_for_project(aiopg_engine, project, [u2, u3])

# find new owner and mark hims as GUEST
q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_project = await query_project_from_db(aiopg_engine, project)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)
q_project = await fetch_project_from_db(aiopg_engine, project)

new_owner = None
remaining_others = []
Expand All @@ -866,7 +866,7 @@ async def test_t9_project_shared_with_other_users_transferred_between_them_and_t

# expected outcome: the new_owner will be deleted and one of the remainint_others wil be the new owner
await assert_user_not_in_database(aiopg_engine, new_owner)
assert await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_one_owner_for_project(aiopg_engine, project, remaining_others)
await assert_users_count(aiopg_engine, 1)
await assert_projects_count(aiopg_engine, 1)

Expand Down Expand Up @@ -894,8 +894,8 @@ async def test_t10_owner_and_all_shared_users_marked_as_guests(
u2 = await login_user(client)
u3 = await login_user(client)

q_u2 = await query_user_from_db(aiopg_engine, u2)
q_u3 = await query_user_from_db(aiopg_engine, u3)
q_u2 = await fetch_user_from_db(aiopg_engine, u2)
q_u3 = await fetch_user_from_db(aiopg_engine, u3)

# u1 creates project and shares it with g1
project = await new_project(
Expand Down

0 comments on commit c01eb9f

Please sign in to comment.