pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix migration path

Browse Source
This commit is contained in:
richard-dds
2019-09-10 13:24:55 -04:00
parent ac0c194490
commit 4405ed91d5
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alembic/versions/502e79c55d2d_add_environment_csp_info.py
View File

@@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '502e79c55d2d' revision = '502e79c55d2d'
down_revision = '4a3122ffe898' # pragma: allowlist secret down_revision = '30ea1cb20807' # pragma: allowlist secret
branch_labels = None branch_labels = None
depends_on = None depends_on = None

1
atst/jobs.py
View File

@@ -6,7 +6,6 @@ from atst.models import EnvironmentJobFailure, EnvironmentRoleJobFailure
from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException
from atst.domain.environments import Environments from atst.domain.environments import Environments
from atst.domain.users import Users from atst.domain.users import Users
from atst.models import Application, Portfolio, TaskOrder, CLIN, Environment
class RecordEnvironmentFailure(celery.Task): class RecordEnvironmentFailure(celery.Task):

17
tests/test_jobs.py
View File

@@ -1,27 +1,19 @@
import pendulum import pendulum
import pytest import pytest
from atst.jobs import RecordEnvironmentFailure, RecordEnvironmentRoleFailure
from tests.factories import EnvironmentFactory, EnvironmentRoleFactory, UserFactory
from uuid import uuid4 from uuid import uuid4
from unittest.mock import Mock from unittest.mock import Mock
from atst.models import Environment from atst.models import Environment
from tests.factories import (
UserFactory,
PortfolioFactory,
CLINFactory,
TaskOrderFactory,
EnvironmentFactory
)
from atst.domain.csp.cloud import MockCloudProvider from atst.domain.csp.cloud import MockCloudProvider
from atst.jobs import ( from atst.jobs import (
RecordEnvironmentFailure,
RecordEnvironmentRoleFailure,
do_create_environment, do_create_environment,
do_create_atat_admin_user, do_create_atat_admin_user,
do_create_environment_baseline, 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): def test_environment_job_failure(celery_app, celery_worker):
@celery_app.task(bind=True, base=RecordEnvironmentFailure) @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] job_failure = role.job_failures[0]
assert job_failure.task == task assert job_failure.task == task
now = pendulum.now() now = pendulum.now()
yesterday = now.subtract(days=1) yesterday = now.subtract(days=1)
tomorrow = now.add(days=1) tomorrow = now.add(days=1)