Update unit tests and fix linter errors

Author: sd109

capi_janitor/openstack/operator.py

@@ -154,7 +154,7 @@ async def try_delete(logger, resource, instances, **kwargs):
     return check_required
 
 
-async def purge_openstack_resources(
+async def purge_openstack_resources(  # noqa: C901
     logger,
     clouds,
     cloud_name,
@@ -193,7 +193,7 @@ async def purge_openstack_resources(
                 logger,
                 loadbalancers,
                 lbs_for_cluster(loadbalancers, name),
-                cascade="true"
+                cascade="true",
             )
             logger.info("deleted load balancers for LoadBalancer services")
 
@@ -441,8 +441,8 @@ async def _on_openstackcluster_event_impl(
             # Default to false since this is default CAPO behaviour if
             # ApiServerLoadBalancer field is omitted from OpenStackClusterSpec
             # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/57ae27ee114bda3606d92163397697b640272673/api/v1beta1/openstackcluster_types.go#L99-L101
-            spec.get('apiServerLoadBalancer', {}).get('enabled', False) and
-            status.get('apiServerLoadBalancer', {}).get('id', '') != ''
+            spec.get("apiServerLoadBalancer", {}).get("enabled", False)
+            and status.get("apiServerLoadBalancer", {}).get("id", "") != ""
         )
 
         await purge_openstack_resources(

capi_janitor/tests/openstack/test_operator.py

@@ -232,6 +232,7 @@ async def test_on_openstackcluster_event_adds_finalizers(
             meta={},
             labels={},
             spec={},
+            status={},
             logger=logger,
             body={},
         )
@@ -258,6 +259,7 @@ async def test_on_openstackcluster_event_skip_no_finalizers(
             meta={"deletionTimestamp": "2023-10-01T00:00:00Z"},
             labels={},
             spec={},
+            status={},
             logger=logger,
             body={},
         )
@@ -319,6 +321,7 @@ async def test_on_openstackcluster_event_calls_purge(
             },
             labels={},
             spec={"identityRef": {"name": "appcred42"}},
+            status={},
             logger=logger,
             body={},
         )
@@ -330,6 +333,7 @@ async def test_on_openstackcluster_event_calls_purge(
             None,
             "mycluster",
             True,
+            False,
             True,
         )
         mock_delete_secret.assert_awaited_once_with("appcred42", "namespace1")
@@ -383,6 +387,7 @@ async def test_purge_openstack_resources_raises(self, mock_from_clouds):
                 None,
                 "mycluster",
                 True,
+                True,
                 False,
             )
         self.assertEqual(

tox.ini

@@ -20,7 +20,7 @@ commands = stestr run {posargs}
 [testenv:autofix]
 commands =
     ruff format {tox_root}
-    codespell {tox_root} -w
+    codespell {tox_root} -w --skip venv
     ruff check {tox_root} --fix
 
 [testenv:black]
@@ -29,7 +29,7 @@ commands =
 commands = black {tox_root} --check
 
 [testenv:codespell]
-commands = codespell {posargs}
+commands = codespell --skip ./venv {posargs}
 
 [testenv:ruff]
 description = Run Ruff checks