From 203213d7009bdf90da791ec6b46cf63b6362fefe Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Wed, 9 Mar 2022 14:56:45 -0500 Subject: [PATCH] Fix tests to use new version of workflow Add test with `metrics` as log level --- tests/scripts/test_task_logging.py | 37 ++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/tests/scripts/test_task_logging.py b/tests/scripts/test_task_logging.py index 41d8d427..7d930da5 100644 --- a/tests/scripts/test_task_logging.py +++ b/tests/scripts/test_task_logging.py @@ -16,6 +16,18 @@ import types class TestTaskLogging(BaseTest): + def add_log(self, log_data): + workflow = self.create_workflow('logging_task') + workflow_api = self.get_workflow_api(workflow) + task = workflow_api.next_task + + workflow_api = self.complete_form(workflow, task, log_data) + task = workflow_api.next_task + + log_id = task.data['log_model']['id'] + + return log_id + def test_logging_validation(self): self.load_test_spec('empty_workflow', master_spec=True) self.create_reference_document() @@ -24,17 +36,26 @@ class TestTaskLogging(BaseTest): self.assertEqual([], rv.json) def test_add_log(self): - workflow = self.create_workflow('logging_task') - workflow_api = self.get_workflow_api(workflow) - task = workflow_api.next_task - - log_id = task.data['log_model']['id'] + log_data = {'level': 'info', + 'code': 'test_code', + 'message': 'You forgot to include the correct data.'} + log_id = self.add_log(log_data) log_model = session.query(TaskLogModel).filter(TaskLogModel.id == log_id).first() self.assertEqual('test_code', log_model.code) self.assertEqual('info', log_model.level) self.assertEqual('Activity_LogEvent', log_model.task) + def test_add_metrics_log(self): + + log_data = {'level': 'metrics', + 'code': 'test_code', + 'message': 'You forgot to include the correct data.'} + log_id = self.add_log(log_data) + log_model = session.query(TaskLogModel).filter(TaskLogModel.id == log_id).first() + + self.assertEqual('metrics', log_model.level) + def test_get_logging_validation(self): self.load_test_spec('empty_workflow', master_spec=True) self.create_reference_document() @@ -92,6 +113,12 @@ class TestTaskLogging(BaseTest): workflow_api = self.get_workflow_api(workflow) task = workflow_api.next_task + form_data = {'level': 'info', + 'code': 'test_code', + 'message': 'You forgot to include the correct data.'} + workflow_api = self.complete_form(workflow, task, form_data) + task = workflow_api.next_task + user = session.query(UserModel).filter_by(uid=self.test_uid).first() url = f'/v1.0/study/{workflow.study_id}/log' task_log_query = TaskLogQuery()