Merge branch 'develop' into fix-alembic-sqlite

debrief · Sep 27, 2021 · c05a0d9 · c05a0d9
2 parents 3210e1b + 3456dac
commit c05a0d9
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 70 deletions.
diff --git a/tests/test_admin_cli.py b/tests/test_admin_cli.py
@@ -807,8 +807,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -820,7 +819,7 @@ def setUp(self):
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_constraints.py b/tests/test_constraints.py
@@ -284,8 +284,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
 
         self.store = DataStore(
             db_name="test",

diff --git a/tests/test_data_store_api_postgis.py b/tests/test_data_store_api_postgis.py
@@ -37,8 +37,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -53,8 +52,8 @@ def setUp(self) -> None:
                 self.change_id = self.store.add_to_changes(
                     "TEST", datetime.utcnow(), "TEST"
                 ).change_id
-        except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+        except Exception:
+            raise Exception("Testing postgres server could not be started/accessed")
 
     def tearDown(self) -> None:
         try:
@@ -258,8 +257,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -275,7 +273,7 @@ def setUp(self) -> None:
                     "TEST", datetime.utcnow(), "TEST"
                 ).change_id
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:
@@ -406,8 +404,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -430,7 +427,7 @@ def setUp(self) -> None:
                 ).name
                 self.privacy = self.store.add_to_privacies("test_privacy", 0, self.change_id).name
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:
@@ -637,8 +634,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -653,7 +649,7 @@ def setUp(self) -> None:
                 self.store.populate_reference(TEST_DATA_PATH)
                 self.store.populate_metadata(TEST_DATA_PATH)
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:
@@ -718,8 +714,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -754,7 +749,7 @@ def setUp(self) -> None:
                 )
                 self.store.session.expunge(self.platform)
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:
@@ -831,8 +826,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -879,7 +873,7 @@ def setUp(self) -> None:
                 self.store.session.expunge(self.file)
                 self.store.session.expunge(self.comment_type)
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
         class TestParser(Importer):
             def __init__(
@@ -1018,8 +1012,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
 
     def tearDown(self) -> None:
         try:

diff --git a/tests/test_data_store_clear_db.py b/tests/test_data_store_clear_db.py
@@ -8,6 +8,7 @@
 from pepys_import.core.store.data_store import DataStore
 
 
+@pytest.mark.postgres
 class DataStoreClearContentsPostGISDBTestCase(TestCase):
     def setUp(self):
         self.store = None
@@ -20,7 +21,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:
@@ -108,7 +109,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_data_store_export_datafile.py b/tests/test_data_store_export_datafile.py
@@ -27,7 +27,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         if os.path.exists(self.path):

diff --git a/tests/test_data_store_initialise.py b/tests/test_data_store_initialise.py
@@ -22,7 +22,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_data_store_populate.py b/tests/test_data_store_populate.py
@@ -156,8 +156,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -169,7 +168,7 @@ def setUp(self) -> None:
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:

diff --git a/tests/test_datastore_utils.py b/tests/test_datastore_utils.py
@@ -249,8 +249,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -262,7 +261,7 @@ def setUp(self):
             )
             self.store.initialise()
         except Exception:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:
@@ -354,8 +353,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -367,7 +365,7 @@ def setUp(self):
             )
             self.store.initialise()
         except Exception:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_import_cli.py b/tests/test_import_cli.py
@@ -80,8 +80,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -93,7 +92,7 @@ def setUp(self):
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:
@@ -142,8 +141,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -155,7 +153,7 @@ def setUp(self):
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:
@@ -424,8 +422,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -437,7 +434,7 @@ def setUp(self):
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_import_cli_end_to_end.py b/tests/test_import_cli_end_to_end.py
@@ -236,8 +236,7 @@ def setup_method(self, test_method):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -250,7 +249,7 @@ def setup_method(self, test_method):
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
         with self.store.session_scope():
             self.store.populate_reference()
 

diff --git a/tests/test_importers_postgis.py b/tests/test_importers_postgis.py
@@ -30,8 +30,7 @@ def setUp(self) -> None:
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -43,7 +42,7 @@ def setUp(self) -> None:
             )
             self.store.initialise()
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self) -> None:
         try:

diff --git a/tests/test_merging.py b/tests/test_merging.py
@@ -1106,8 +1106,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
 
         self.master_store = DataStore(
             db_name="test",
@@ -2377,8 +2376,7 @@ def setUp(self, patched_input, patched_iterfzf):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
 
         self.master_store = DataStore(
             db_name="test",

diff --git a/tests/test_spatial_data.py b/tests/test_spatial_data.py
@@ -97,8 +97,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
         try:
             self.store = DataStore(
                 db_name="test",
@@ -131,7 +130,7 @@ def setUp(self):
                 state.location = loc
                 self.store.session.add(state)
         except OperationalError:
-            print("Database schema and data population failed! Test is skipping.")
+            raise Exception("Creating database schema in testing Postgres database failed")
 
     def tearDown(self):
         try:

diff --git a/tests/test_tasks_and_participants.py b/tests/test_tasks_and_participants.py
@@ -333,8 +333,7 @@ def setUp(self):
                 port=55527,
             )
         except RuntimeError:
-            print("PostgreSQL database couldn't be created! Test is skipping.")
-            return
+            raise Exception("Testing Postgres server could not be started/accessed")
 
         self.store = DataStore(
             db_name="test",