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

Update name of function

Browse Source
This commit is contained in:
leigh-mil 2020-02-18 11:55:22 -05:00
parent b8bf106a96
commit 1d8bb2811d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/jobs.py
View File

@ -292,7 +292,7 @@ def dispatch_create_atat_admin_user(self):
@celery.task(bind=True) @celery.task(bind=True)
def dispatch_send_task_order_files(self): def send_task_order_files(self):
task_orders = TaskOrders.get_for_send_task_order_files() task_orders = TaskOrders.get_for_send_task_order_files()
recipients = [app.config.get("MICROSOFT_TASK_ORDER_EMAIL_ADDRESS")] recipients = [app.config.get("MICROSOFT_TASK_ORDER_EMAIL_ADDRESS")]
@ -313,7 +313,7 @@ def dispatch_send_task_order_files(self):
app.logger.exception(err) app.logger.exception(err)
continue continue
task_order.pdf_last_sent_at = pendulum.now() task_order.pdf_last_sent_at = pendulum.now(tz="UTC")
db.session.add(task_order) db.session.add(task_order)
db.session.commit() db.session.commit()

4
atst/queue.py
View File

@ -27,8 +27,8 @@ def update_celery(celery, app):
"task": "atst.jobs.dispatch_create_environment_role", "task": "atst.jobs.dispatch_create_environment_role",
"schedule": 60, "schedule": 60,
}, },
"beat-dispatch_send_task_order_files": { "beat-send_task_order_files": {
"task": "atst.jobs.dispatch_send_task_order_files", "task": "atst.jobs.send_task_order_files",
"schedule": 60, "schedule": 60,
}, },
} }

12
tests/test_jobs.py
View File

@ -16,7 +16,6 @@ from atst.jobs import (
dispatch_create_user, dispatch_create_user,
dispatch_create_environment_role, dispatch_create_environment_role,
dispatch_provision_portfolio, dispatch_provision_portfolio,
dispatch_send_task_order_files,
create_environment, create_environment,
do_create_user, do_create_user,
do_provision_portfolio, do_provision_portfolio,
@ -24,6 +23,7 @@ from atst.jobs import (
do_create_environment_role, do_create_environment_role,
do_create_application, do_create_application,
send_PPOC_email, send_PPOC_email,
send_task_order_files,
) )
from tests.factories import ( from tests.factories import (
ApplicationFactory, ApplicationFactory,
@ -415,7 +415,7 @@ def test_create_environment_role():
assert env_role.cloud_id == "a-cloud-id" assert env_role.cloud_id == "a-cloud-id"
class TestDispatchSendTaskOrderFiles: class TestSendTaskOrderFiles:
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def send_mail(self, monkeypatch): def send_mail(self, monkeypatch):
mock = Mock() mock = Mock()
@ -437,14 +437,14 @@ class TestDispatchSendTaskOrderFiles:
for i in range(3): for i in range(3):
TaskOrderFactory.create(create_clins=[{"number": "0001"}]) TaskOrderFactory.create(create_clins=[{"number": "0001"}])
dispatch_send_task_order_files.run() send_task_order_files.run()
# Check that send_with_attachment was called once for each task order # Check that send_with_attachment was called once for each task order
assert send_mail.call_count == 3 assert send_mail.call_count == 3
def test_kwargs(self, send_mail, download_task_order, app): def test_kwargs(self, send_mail, download_task_order, app):
task_order = TaskOrderFactory.create(create_clins=[{"number": "0001"}]) task_order = TaskOrderFactory.create(create_clins=[{"number": "0001"}])
dispatch_send_task_order_files.run() send_task_order_files.run()
# Check that send_with_attachment was called with correct kwargs # Check that send_with_attachment was called with correct kwargs
send_mail.assert_called_once_with( send_mail.assert_called_once_with(
@ -471,7 +471,7 @@ class TestDispatchSendTaskOrderFiles:
monkeypatch.setattr("atst.jobs.send_mail", _raise_smtp_exception) monkeypatch.setattr("atst.jobs.send_mail", _raise_smtp_exception)
task_order = TaskOrderFactory.create(create_clins=[{"number": "0001"}]) task_order = TaskOrderFactory.create(create_clins=[{"number": "0001"}])
dispatch_send_task_order_files.run() send_task_order_files.run()
# Check that pdf_last_sent_at has not been updated # Check that pdf_last_sent_at has not been updated
assert not task_order.pdf_last_sent_at assert not task_order.pdf_last_sent_at
@ -485,7 +485,7 @@ class TestDispatchSendTaskOrderFiles:
_download_task_order, _download_task_order,
) )
task_order = TaskOrderFactory.create(create_clins=[{"number": "0002"}]) task_order = TaskOrderFactory.create(create_clins=[{"number": "0002"}])
dispatch_send_task_order_files.run() send_task_order_files.run()
# Check that pdf_last_sent_at has not been updated # Check that pdf_last_sent_at has not been updated
assert not task_order.pdf_last_sent_at assert not task_order.pdf_last_sent_at