Finish smoke test

Author: rod-glover

tests/alembic_migrations/helpers.py

@@ -55,6 +55,40 @@ def check_triggers(connection, table, expected, present=True):
         else:
             assert item not in triggers
 
+
+def check_orm_actual_tables_match(engine, orm_table, schema_name=get_schema_name()):
+    """Check that table defined in ORM matches the actual table in the database.
+    This method is useful in smoke tests."""
+
+    # Check actual table existence
+    names = set(get_schema_item_names(engine, "tables", schema_name=schema_name))
+    assert orm_table.__tablename__ in names
+
+    # Reflect table
+    metadata = MetaData(schema=schema_name, bind=engine)
+    actual_table = Table(orm_table.__tablename__, metadata, autoload_with=engine)
+
+    # Check that table columns match
+    def type_match(class1, class2):
+        return (
+            # This is usually the case if they match
+            issubclass(class1, class2)
+            or issubclass(class2, class1)
+            # Ad-hocery around dialect vs non-dialect types
+            or all(issubclass(c, sqltypes._AbstractInterval) for c in (class1, class2))
+        )
+
+    # This checks column order as well as type.
+    for actual_col, orm_col in zip(actual_table.columns, orm_table.__table__.columns):
+        assert actual_col.name == orm_col.name
+        # print(
+        #     f"{actual_col.name}: actual {actual_col.type.__class__} orm:  {orm_col.type.__class__}"
+        # )
+        assert type_match(
+            actual_col.type.__class__, orm_col.type.__class__
+        ), f"{actual_col.name}: actual {actual_col.type.__class__} orm:  {orm_col.type.__class__}"
+
+
 def check_history_tracking_upgrade(
     connection: Connection,
     table_name: str,

tests/alembic_migrations/versions/v_758be4f4ce0f_support_multiple_climatological_normals/test_smoke.py

@@ -69,7 +69,7 @@ def test_downgrade(
 from pycds import ClimatologicalStation, ClimatologicalStationXHistory, ClimatologicalVariable, ClimatologicalValue
 from pycds.alembic.change_history_utils import pri_table_name, hx_table_name, hx_id_name
 from pycds.database import get_schema_item_names
-from tests.alembic_migrations.helpers import check_table_orm_actual_match
+from tests.alembic_migrations.helpers import check_orm_actual_tables_match
 
 logger = logging.getLogger("tests")
 
@@ -92,7 +92,7 @@ def test_upgrade(
     engine, script = prepared_schema_from_migrations_left
 
     # Check that table has been created as expected.
-    check_table_orm_actual_match(engine, orm_table, schema_name=schema_name)
+    check_orm_actual_tables_match(engine, orm_table, schema_name=schema_name)
 
 
 @pytest.mark.usefixtures("new_db_left")
@@ -108,6 +108,6 @@ def test_downgrade(
     # Run downgrade migration
     command.downgrade(alembic_config_left, "-1")
 
-    # Check that tables have been altered or dropped as expected.
+    # Check that tables have been dropped as expected.
     names = set(get_schema_item_names(engine, "tables", schema_name=schema_name))
     assert table.__tablename__ not in names