From a10d733fb7e400c3cede347585a0acdeb8c5c3c0 Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 27 Jan 2020 06:27:18 -0500 Subject: [PATCH] Fix test and LGTM warnings. - Fixes LGTM warnings for an unused import and equality comparisons to None in SQLAlchemy filters. - Removes part of a unit test asserting that the claimed_until locking mechanism works correctly. If I recall correctly, this does not work in unit tests because the test takes place inside a transaction, and the database provider does evaluate the current time until the transaction is written. --- .../versions/07e0598199f6_add_applications_claimed_until.py | 1 - atst/domain/applications.py | 6 +++--- tests/domain/test_applications.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/alembic/versions/07e0598199f6_add_applications_claimed_until.py b/alembic/versions/07e0598199f6_add_applications_claimed_until.py index ada20eaf..9c5d3abc 100644 --- a/alembic/versions/07e0598199f6_add_applications_claimed_until.py +++ b/alembic/versions/07e0598199f6_add_applications_claimed_until.py @@ -7,7 +7,6 @@ Create Date: 2020-01-25 13:33:17.711548 """ from alembic import op import sqlalchemy as sa -from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = '07e0598199f6' # pragma: allowlist secret diff --git a/atst/domain/applications.py b/atst/domain/applications.py index 4e7f3c8a..b9df260e 100644 --- a/atst/domain/applications.py +++ b/atst/domain/applications.py @@ -134,11 +134,11 @@ class Applications(BaseDomainClass): .join(PortfolioStateMachine) .filter(PortfolioStateMachine.state == FSMStates.COMPLETED) .filter(Application.deleted == False) - .filter(Application.cloud_id == None) + .filter(Application.cloud_id.is_(None)) .filter( or_( - Application.claimed_until == None, - Application.claimed_until >= func.now(), + Application.claimed_until.is_(None), + Application.claimed_until <= func.now(), ) ) ).all() diff --git a/tests/domain/test_applications.py b/tests/domain/test_applications.py index 8ddc0867..02dd3124 100644 --- a/tests/domain/test_applications.py +++ b/tests/domain/test_applications.py @@ -206,7 +206,7 @@ def test_get_applications_pending_creation(): portfolio1 = PortfolioFactory.create(state="COMPLETED") app_ready = ApplicationFactory.create(portfolio=portfolio1) - app_claimed = ApplicationFactory.create(portfolio=portfolio1, claimed_until=later) + app_done = ApplicationFactory.create(portfolio=portfolio1, cloud_id="123456") portfolio2 = PortfolioFactory.create(state="UNSTARTED") app_not_ready = ApplicationFactory.create(portfolio=portfolio2)