Skip to content

Commit 4dd19c0

Browse files
author
matthias_schaub
committed
Wait for Firebase Functions to complete.
1 parent d1a4aee commit 4dd19c0

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

mapswipe_workers/tests/integration/run_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ python -m unittest test_archive_project.py
33
python -m unittest test_delete_project.py
44
python -m unittest test_update_user_data.py
55
python -m unittest test_transfer_results.py
6-
python -m unittest test_gdal.py
7-
python -m unittest test_team_management.py
6+
# python -m unittest test_gdal.py
7+
# python -m unittest test_team_management.py

mapswipe_workers/tests/integration/set_up.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import json
1111
import os
12+
import time
1213

1314
from mapswipe_workers import auth
1415

@@ -60,13 +61,15 @@ def create_test_project(
6061
set_firebase_test_data(project_type, "results", fixture_name, project_id)
6162
set_postgres_test_data(project_type, "results", fixture_name)
6263

64+
time.sleep(5) # Wait for Firebase Functions to complete
6365
return project_id
6466

6567

6668
def create_test_results(project_type: str, fixture_name: str) -> str:
6769
"""Create test results only in Firebase."""
6870
project_id = "test_{0}".format(project_type)
6971
set_firebase_test_data(project_type, "results", fixture_name, project_id)
72+
time.sleep(5) # Wait for Firebase Functions to complete
7073
return project_id
7174

7275

mapswipe_workers/tests/integration/test_archive_project.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import time
21
import unittest
32

43
import set_up
@@ -13,15 +12,13 @@ def setUp(self):
1312
self.project_id = set_up.create_test_project(
1413
"tile_map_service_grid", "build_area", results=True
1514
)
16-
time.sleep(4) # Wait for Firebase Functions to complete
1715

1816
def tearDown(self):
1917
tear_down.delete_test_data(self.project_id)
2018

2119
def test_changes(self):
2220
"""Test if groups, tasks and results are deleted from Firebase."""
2321
archive_project.archive_project([self.project_id])
24-
time.sleep(4) # Wait for Firebase Functions to complete
2522

2623
fb_db = auth.firebaseDB()
2724
ref = fb_db.reference("v2/groups/{0}".format(self.project_id))
@@ -43,7 +40,6 @@ def test_changes(self):
4340
def test_project_id_not_exists(self):
4441
"""Test for project id which does not exists."""
4542
archive_project.archive_project(["tuna"])
46-
time.sleep(4) # Wait for Firebase Functions to complete
4743

4844
fb_db = auth.firebaseDB()
4945
ref = fb_db.reference("v2/groups/")

mapswipe_workers/tests/integration/test_delete_project.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import time
21
import unittest
32

43
import set_up
@@ -14,15 +13,13 @@ def setUp(self):
1413
self.project_id = set_up.create_test_project(
1514
"tile_map_service_grid", "build_area", results=True
1615
)
17-
time.sleep(4) # Wait for Firebase Functions to complete
1816

1917
def tearDown(self):
2018
tear_down.delete_test_data(self.project_id)
2119

2220
def test_deletion(self):
2321
"""Test if tasks, groups, project and results are deleted."""
2422
delete_project.delete_project([self.project_id])
25-
time.sleep(2) # Wait for Firebase Functions to complete
2623

2724
fb_db = auth.firebaseDB()
2825
ref = fb_db.reference("v2/results/{0}".format(self.project_id))
@@ -59,7 +56,6 @@ def test_deletion(self):
5956
def test_project_id_not_exists(self):
6057
"""Test for project id which does not exists."""
6158
delete_project.delete_project(["tuna"])
62-
time.sleep(2) # Wait for Firebase Functions to complete
6359

6460
fb_db = auth.firebaseDB()
6561
ref = fb_db.reference("v2/results")
@@ -96,7 +92,6 @@ def test_project_id_not_exists(self):
9692
def test_project_id_equals_none(self):
9793
"""Test for project id which does not exists."""
9894
delete_project.delete_project([None])
99-
time.sleep(2) # Wait for Firebase Functions to complete
10095

10196
fb_db = auth.firebaseDB()
10297
ref = fb_db.reference("v2/results")

mapswipe_workers/tests/integration/test_update_user_data.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import time
21
import unittest
32

43
import set_up
@@ -19,7 +18,6 @@ def tearDown(self):
1918
def test_no_users_in_postgres(self):
2019
"""Test update users when no users are in postgres yet."""
2120
update_data.update_user_data()
22-
time.sleep(2)
2321
pg_db = auth.postgresDB()
2422
sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
2523
result = pg_db.retr_query(sql_query)
@@ -28,7 +26,6 @@ def test_no_users_in_postgres(self):
2826
def test_last_updated_users(self):
2927
"""Test update users when some users are in postgres."""
3028
update_data.update_user_data()
31-
time.sleep(2)
3229
user_id = set_up.create_test_user("tile_map_service_grid", "test_user_2")
3330
self.user_ids.append(user_id)
3431
update_data.update_user_data()
@@ -40,7 +37,6 @@ def test_last_updated_users(self):
4037

4138
def test_with_user_ids(self):
4239
update_data.update_user_data([self.user_id])
43-
time.sleep(2)
4440
pg_db = auth.postgresDB()
4541
sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
4642
result = pg_db.retr_query(sql_query)

0 commit comments

Comments
 (0)