From 9655aa8a94cd719a8b422d841f93122572523d1d Mon Sep 17 00:00:00 2001 From: jasquat Date: Mon, 3 Apr 2023 11:50:28 -0400 Subject: [PATCH] pyl and fixed tests --- .../routes/process_instances_controller.py | 2 +- .../unit/test_process_instance_processor.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py index a7dda2104..7bbec1ff0 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py @@ -674,8 +674,8 @@ def process_instance_task_list( for task_model in task_models: if task_model.bpmn_identifier not in task_model_list: task_model_list[task_model.bpmn_identifier] = task_model + task_models = list(task_model_list.values()) - task_models = list(task_model_list.values()) if to_task_model is not None: task_models_dict = json.loads(current_app.json.dumps(task_models)) for task_model in task_models_dict: diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_processor.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_processor.py index ac5d39989..70978a97b 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_processor.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_processor.py @@ -1,6 +1,5 @@ """Test_process_instance_processor.""" from uuid import UUID -from spiffworkflow_backend.models.db import db import pytest from flask import g @@ -13,6 +12,7 @@ from tests.spiffworkflow_backend.helpers.test_data import load_test_spec from spiffworkflow_backend.exceptions.api_error import ApiError from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel +from spiffworkflow_backend.models.db import db from spiffworkflow_backend.models.group import GroupModel from spiffworkflow_backend.models.process_instance import ProcessInstanceModel from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus @@ -365,7 +365,9 @@ class TestProcessInstanceProcessor(BaseTest): # make sure we reset to the task we expected ready_or_waiting_tasks = processor.get_all_ready_or_waiting_tasks() - top_level_subprocess_script_spiff_task = next(task for task in ready_or_waiting_tasks if task.task_spec.name == "top_level_subprocess_script") + top_level_subprocess_script_spiff_task = next( + task for task in ready_or_waiting_tasks if task.task_spec.name == "top_level_subprocess_script" + ) assert top_level_subprocess_script_spiff_task is not None processor.resume() processor.do_engine_steps(save=True)