integration: Move mock patches to class setUp

coriolis/tests/integration/base.py

@@ -52,6 +52,13 @@ def setUpClass(cls):
         cls._imp_platform = cls._harness.imp_provider_platform
         cls._client = cls.get_client()
 
+    def setUp(self):
+        super().setUp()
+
+        patcher = mock.patch("psutil.Process.send_signal")
+        patcher.start()
+        self.addCleanup(patcher.stop)
+
     # Helpers for subclasses
     @classmethod
     def get_client(cls):

coriolis/tests/integration/harness.py

@@ -262,9 +262,6 @@ def __init__(self):
         coriolis_utils.setup_logging()
         test_utils.init_scsi_debug()
 
-        self._send_signal_patcher = mock.patch("psutil.Process.send_signal")
-        self._send_signal_patcher.start()
-
         # Policy enforcer: reset so it re-reads the new CONF (no policy file).
         policy_module.reset()
 
@@ -418,8 +415,6 @@ def _start_coriolis_services(self):
     def _teardown(self):
         LOG.info("Teardown initiated.")
 
-        self._send_signal_patcher.stop()
-
         try:
             coriolis_utils.exec_process(
                 [

coriolis/tests/integration/test_failure_recovery.py

@@ -13,7 +13,6 @@
 Must be run as root; requires the scsi_debug kernel module.
 """
 
-import unittest
 from unittest import mock
 
 from coriolis.tests.integration import base
@@ -25,10 +24,6 @@ class TransferFailureIntegrationTest(base.ReplicaIntegrationTestBase):
 
     def test_error_status_on_provider_failure(self):
         """Execution reaches ERROR when target resource deployment fails."""
-        raise unittest.SkipTest(
-            "Currently skipped, causes the test process to be killed. "
-            "Re-enable the test once we switch to external Coriolis services.")
-
         injected_error = Exception("injected target resource failure")
 
         with mock.patch.object(