diff --git a/alembic/versions/502e79c55d2d_add_environment_csp_info.py b/alembic/versions/502e79c55d2d_add_environment_csp_info.py index 3804e3a9..ab1f4555 100644 --- a/alembic/versions/502e79c55d2d_add_environment_csp_info.py +++ b/alembic/versions/502e79c55d2d_add_environment_csp_info.py @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = '502e79c55d2d' -down_revision = '4a3122ffe898' # pragma: allowlist secret +down_revision = '30ea1cb20807' # pragma: allowlist secret branch_labels = None depends_on = None diff --git a/atst/jobs.py b/atst/jobs.py index 50a06588..2c95f235 100644 --- a/atst/jobs.py +++ b/atst/jobs.py @@ -6,7 +6,6 @@ from atst.models import EnvironmentJobFailure, EnvironmentRoleJobFailure from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException from atst.domain.environments import Environments from atst.domain.users import Users -from atst.models import Application, Portfolio, TaskOrder, CLIN, Environment class RecordEnvironmentFailure(celery.Task): diff --git a/tests/test_jobs.py b/tests/test_jobs.py index 409663d1..be4f13fe 100644 --- a/tests/test_jobs.py +++ b/tests/test_jobs.py @@ -1,27 +1,19 @@ import pendulum import pytest - -from atst.jobs import RecordEnvironmentFailure, RecordEnvironmentRoleFailure -from tests.factories import EnvironmentFactory, EnvironmentRoleFactory, UserFactory from uuid import uuid4 from unittest.mock import Mock from atst.models import Environment -from tests.factories import ( - UserFactory, - PortfolioFactory, - CLINFactory, - TaskOrderFactory, - EnvironmentFactory -) from atst.domain.csp.cloud import MockCloudProvider from atst.jobs import ( + RecordEnvironmentFailure, + RecordEnvironmentRoleFailure, do_create_environment, do_create_atat_admin_user, do_create_environment_baseline, - environments_to_create, ) -from atst.models import Environment +from tests.factories import EnvironmentFactory, EnvironmentRoleFactory, UserFactory + def test_environment_job_failure(celery_app, celery_worker): @celery_app.task(bind=True, base=RecordEnvironmentFailure) @@ -58,6 +50,7 @@ def test_environment_role_job_failure(celery_app, celery_worker): job_failure = role.job_failures[0] assert job_failure.task == task + now = pendulum.now() yesterday = now.subtract(days=1) tomorrow = now.add(days=1)