fix pep8

gnocchixyz · Feb 14, 2025 · 5d0bb33 · 5d0bb33
1 parent 681eec9
commit 5d0bb33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/gnocchi/indexer/alembic/versions/f89ed2e3c2ec_create_last_measure_timestamp_column.py b/gnocchi/indexer/alembic/versions/f89ed2e3c2ec_create_last_measure_timestamp_column.py
@@ -34,7 +34,7 @@
 def upgrade():
     sql_column = sqlalchemy.Column(
             "last_measure_timestamp", sqlalchemy.DateTime,
-            nullable=False, default=datetime.datetime.now(datetime.UTC),
+            nullable=False, default=datetime.datetime.utcnow(),
             server_default=sqlalchemy.sql.func.current_timestamp())
     op.add_column(
         "metric", sql_column)
diff --git a/gnocchi/indexer/sqlalchemy_base.py b/gnocchi/indexer/sqlalchemy_base.py
@@ -120,7 +120,7 @@ class Metric(Base, GnocchiBase, indexer.Metric):
     # measurements; thus, if all metric for a resource are in this situation,
     # chances are that the resource ceased existing in the backend.
     last_measure_timestamp = sqlalchemy.Column(
-        "last_measure_timestamp", sqlalchemy.DateTime, default=datetime.datetime.now(datetime.UTC), nullable=False,
+        "last_measure_timestamp", sqlalchemy.DateTime, default=datetime.datetime.utcnow(), nullable=False,
         server_default=sqlalchemy.sql.func.current_timestamp())
 
     def jsonify(self):

diff --git a/gnocchi/tests/indexer/sqlalchemy/test_migrations.py b/gnocchi/tests/indexer/sqlalchemy/test_migrations.py
@@ -105,17 +105,18 @@ def compare_server_default(self, ctxt, ins_col, meta_col, insp_def, meta_def, re
 
         """
 
-
         method_return = super(ModelsMigrationsSync, self).compare_server_default(ctxt, ins_col, meta_col, insp_def,
                                                                                  meta_def, rendered_meta_def)
 
-        is_meta_column_default_timestamp = isinstance(meta_def.arg, sa.sql.functions.current_timestamp)
-        is_reflected_column_default_text_type = isinstance(ins_col.server_default.arg, sa.sql.elements.TextClause)
+        is_meta_column_default_timestamp = meta_def is not None and isinstance(
+            meta_def.arg, sa.sql.functions.current_timestamp)
+        is_reflected_column_default_text_type = ins_col is not None and ins_col.server_default is not None and \
+            isinstance(ins_col.server_default.arg, sa.sql.elements.TextClause)
 
         is_server_default_current_timestamp = is_meta_column_default_timestamp and is_reflected_column_default_text_type
 
         if not is_server_default_current_timestamp:
             return method_return
 
-        # If it is different from "CURRENT_TIMESTAMP", then we must throw an error.
+        # If it is different from "CURRENT_TIMESTAMP", then we must return True, so the test flow continues.
         return rendered_meta_def != "CURRENT_TIMESTAMP"