From 29d62b1f0233a68e24f9e087e1ae39c8b1027619 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Mon, 30 Oct 2023 15:04:01 +0100
Subject: [PATCH] update unit test for iptrunk termination
---
.../iptrunk/test_terminate_iptrunk.py | 29 +++----------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/test/workflows/iptrunk/test_terminate_iptrunk.py b/test/workflows/iptrunk/test_terminate_iptrunk.py
index c8398dc5..a3ac220a 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)
--
GitLab