Cleanup unittests (#319)

Remove unused utils functions, replace helper add_steps to
<plan>.add_steps and rename test files.

tests/unit/apps/test_auxiliary.py

@@ -26,7 +26,6 @@
 )
 from cou.utils import app_utils
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 
 def test_auxiliary_app(status, config, model, apps_machines):
@@ -152,7 +151,7 @@ def test_auxiliary_upgrade_plan_ussuri_to_victoria_change_channel(
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -217,7 +216,7 @@ def test_auxiliary_upgrade_plan_ussuri_to_victoria(status, config, model, apps_m
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -287,7 +286,7 @@ def test_auxiliary_upgrade_plan_ussuri_to_victoria_ch_migration(
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -481,7 +480,7 @@ def test_ceph_mon_upgrade_plan_xena_to_yoga(status, config, model, apps_machines
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -552,7 +551,7 @@ def test_ceph_mon_upgrade_plan_ussuri_to_victoria(
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -669,7 +668,7 @@ def test_ovn_principal_upgrade_plan(status, config, model, apps_machines):
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -729,6 +728,6 @@ def test_mysql_innodb_cluster_upgrade(status, config, model, apps_machines):
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan

tests/unit/apps/test_auxiliary_subordinate.py

@@ -22,7 +22,6 @@
 from cou.exceptions import ApplicationError, HaltUpgradePlanGeneration
 from cou.steps import ApplicationUpgradePlan, PreUpgradeStep, UpgradeStep
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 
 def test_auxiliary_subordinate(apps):
@@ -114,7 +113,7 @@ def test_ovn_subordinate_upgrade_plan(status, model):
             coro=model.upgrade_charm(app.name, "22.03/stable", switch=None),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -167,7 +166,7 @@ def test_ceph_dashboard_upgrade_plan_ussuri_to_victoria(status, config, model):
             coro=model.upgrade_charm(app.name, "octopus/stable", switch=None),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -202,6 +201,6 @@ def test_ceph_dashboard_upgrade_plan_xena_to_yoga(status, config, model):
             coro=model.upgrade_charm(app.name, "quincy/stable"),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan

tests/unit/apps/test_channel_based.py

@@ -19,7 +19,6 @@
 )
 from cou.utils import app_utils
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 
 def test_application_versionless(status, config, model, apps_machines):
@@ -139,7 +138,7 @@ def test_application_versionless_upgrade_plan_ussuri_to_victoria(
         ),
     ]
 
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -211,7 +210,7 @@ def test_application_gnocchi_upgrade_plan_ussuri_to_victoria(status, config, mod
         ),
     ]
 
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -284,6 +283,6 @@ def test_application_designate_bind_upgrade_plan_ussuri_to_victoria(
         ),
     ]
 
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan

tests/unit/apps/test_core.py

@@ -30,7 +30,6 @@
 )
 from cou.utils import app_utils
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 
 def test_application_eq(status, config, model, apps_machines):
@@ -440,7 +439,7 @@ def test_upgrade_plan_ussuri_to_victoria(status, config, model, apps_machines):
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -509,7 +508,7 @@ def test_upgrade_plan_ussuri_to_victoria_ch_migration(status, config, model, app
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -569,7 +568,7 @@ def test_upgrade_plan_channel_on_next_os_release(status, config, model, apps_mac
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -629,7 +628,7 @@ def test_upgrade_plan_origin_already_on_next_openstack_release(
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -710,6 +709,6 @@ def test_upgrade_plan_application_already_disable_action_managed(
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan

tests/unit/apps/test_subordinate.py

@@ -20,7 +20,6 @@
 from cou.exceptions import ApplicationError
 from cou.steps import ApplicationUpgradePlan, PreUpgradeStep, UpgradeStep
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,7 @@ def test_generate_upgrade_plan(status, model):
             coro=model.upgrade_charm(app.name, "victoria/stable"),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -133,7 +132,7 @@ def test_generate_plan_ch_migration(status, model, channel):
             coro=model.upgrade_charm(app.name, "wallaby/stable"),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -167,7 +166,7 @@ def test_generate_plan_from_to(status, model, from_os, to_os):
             coro=model.upgrade_charm(app.name, f"{to_os}/stable"),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan
 
@@ -198,6 +197,6 @@ def test_generate_plan_in_same_version(status, model, from_to):
             coro=model.upgrade_charm(app.name, f"{from_to}/stable", switch=None),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
 
     assert upgrade_plan == expected_plan

tests/unit/steps/test_steps_plan.py → tests/unit/steps/test_plan.py

@@ -40,7 +40,6 @@
 )
 from cou.utils import app_utils
 from cou.utils.openstack import OpenStackRelease
-from tests.unit.apps.utils import add_steps
 
 
 def generate_expected_upgrade_plan_principal(app, target, model):
@@ -110,7 +109,7 @@ def generate_expected_upgrade_plan_principal(app, target, model):
             coro=app._check_upgrade(target),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
     return expected_plan
 
 
@@ -133,7 +132,7 @@ def generate_expected_upgrade_plan_subordinate(app, target, model):
             coro=model.upgrade_charm(app.name, f"{target.codename}/stable"),
         ),
     ]
-    add_steps(expected_plan, upgrade_steps)
+    expected_plan.add_steps(upgrade_steps)
     return expected_plan