openstack
/
mistral
Code Issues Proposed changes

Fix unit test failures 

This change fixes the following two patterns of errors detected in
gate.

1)
sqlalchemy.exc.ArgumentError: Textual column expression '...' should be
explicitly declared with text('...'), or use column('...') for more
specificity

2)
testtools.matchers._impl.MismatchError: '('...',)' is not an instance
of tuple

Change-Id: Ie080bdcacf9aa2dd2fe0454bcb814285c08bbfa8
This commit is contained in:
Takashi Kajinami 2021-07-07 09:26:08 +09:00
parent c63e6e086e
commit de880e801c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mistral/db/sqlalchemy/base.py
View File

@ -20,6 +20,7 @@ from oslo_db import options
from oslo_db.sqlalchemy import enginefacade
import osprofiler.sqlalchemy
import sqlalchemy as sa
from sqlalchemy.sql import column
from mistral.db.sqlalchemy import sqlite_lock
from mistral import exceptions as exc
@ -238,6 +239,7 @@ def model_query(model, columns=(), session=None):
"""
if columns:
return session.query(*columns)
_columns = (column(c) if isinstance(c, str) else c for c in columns)
return session.query(*_columns)
return session.query(model)

6
mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
View File

@ -123,7 +123,6 @@ class WorkbookTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.scope, fetched[0])
@ -546,7 +545,6 @@ class WorkflowDefinitionTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.scope, fetched[0])
@ -1142,7 +1140,6 @@ class ActionDefinitionTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.scope, fetched[0])
@ -1493,7 +1490,6 @@ class ActionExecutionTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.name, fetched[0])
@ -1689,7 +1685,6 @@ class WorkflowExecutionTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.state, fetched[0])
@ -2111,7 +2106,6 @@ class TaskExecutionTest(SQLAlchemyTest):
)
self.assertNotEqual(created, fetched)
self.assertIsInstance(fetched, tuple)
self.assertEqual(1, len(fetched))
self.assertEqual(created.name, fetched[0])