openstack
/
glance
Code Issues Proposed changes

Merge "db: Don't invoke and_() without arguments"

This commit is contained in:
Zuul 2023-09-08 13:52:15 +00:00 committed by Gerrit Code Review
parent d64b446bd0 36329c0a75
commit d001291007
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/db/sqlalchemy/api.py
View File

@ -565,7 +565,7 @@ def _select_images_query(context, image_conditions, admin_as_user,
member_status, visibility):
session = get_session()
img_conditional_clause = sa_sql.and_(*image_conditions)
img_conditional_clause = sa_sql.and_(True, *image_conditions)
regular_user = (not context.is_admin) or admin_as_user

7
glance/tests/unit/fixtures.py
View File

@ -178,13 +178,6 @@ class WarningsFixture(pyfixtures.Fixture):
# ...but filter everything out until we get around to fixing them
# TODO(stephenfin): Fix all of these
warnings.filterwarnings(
'ignore',
module='glance',
category=sqla_exc.SADeprecationWarning,
message=r'Invoking and_\(\) without arguments is deprecated',
)
warnings.filterwarnings(
'ignore',
module='glance',