diff --git a/test/workflows/iptrunk/test_terminate_iptrunk.py b/test/workflows/iptrunk/test_terminate_iptrunk.py index c8398dc5a18364a6aa85a32fd76af4ff804281b8..a3ac220a268f228373914b4e67446b6fa02d519f 100644 --- a/test/workflows/iptrunk/test_terminate_iptrunk.py +++ b/test/workflows/iptrunk/test_terminate_iptrunk.py @@ -4,14 +4,7 @@ import pytest from gso.products import Iptrunk from test.services.conftest import MockedNetboxClient -from test.workflows import ( - assert_complete, - assert_suspended, - extract_state, - resume_workflow, - run_workflow, - user_accept_and_assert_suspended, -) +from test.workflows import assert_complete, assert_pp_interaction_success, extract_state, run_workflow @pytest.mark.workflow @@ -28,6 +21,7 @@ def test_successful_iptrunk_termination( mock_provision_ip_trunk, iptrunk_subscription_factory, faker, + data_config_filename, ): # Set up mock return values product_id = iptrunk_subscription_factory() @@ -41,24 +35,9 @@ def test_successful_iptrunk_termination( {"tt_number": faker.tt_number(), "remove_configuration": True, "clean_up_ipam": True}, ] result, process_stat, step_log = run_workflow("terminate_iptrunk", initial_iptrunk_data) - assert_suspended(result) - lso_return = { - "pp_run_results": { - "status": "ok", - "job_id": faker.uuid4(), - "output": "parsed_output", - "return_code": 0, - }, - "confirm": "ACCEPTED", - } - - for _ in range(2): - result, step_log = user_accept_and_assert_suspended(process_stat, step_log, lso_return) - result, step_log = user_accept_and_assert_suspended(process_stat, step_log, [{}, {}]) - - result, step_log = user_accept_and_assert_suspended(process_stat, step_log, lso_return) - result, step_log = resume_workflow(process_stat, step_log, [{}, {}]) + for _ in range(3): + result, step_log = assert_pp_interaction_success(result, process_stat, step_log) assert_complete(result)