From d8d43e1a147b15666e97206795c0eca2ad7a3f10 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Mon, 30 Oct 2023 15:01:37 +0100
Subject: [PATCH] update trunk interface modification workflow unit test
---
.../iptrunk/test_modify_trunk_interface.py | 27 +++----------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 68e2e7fa..2cb048c3 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -4,14 +4,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
-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
from test.workflows.iptrunk.test_create_iptrunk import MockedNetboxClient
@@ -33,6 +26,7 @@ def test_iptrunk_modify_trunk_interface_success(
mock_provision_ip_trunk,
iptrunk_subscription_factory,
faker,
+ data_config_filename,
):
# Set up mock return values
mocked_netbox = MockedNetboxClient()
@@ -82,22 +76,9 @@ def test_iptrunk_modify_trunk_interface_success(
]
result, process_stat, step_log = run_workflow("modify_trunk_interface", 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",
- }
- 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(2):
+ result, step_log = assert_pp_interaction_success(result, process_stat, step_log)
assert_complete(result)
--
GitLab