Merge pull request redpanda-data#6342 from ztlpn/fix-5980

Heal network failures in the end of EndToEndFinjectorTest

Author: ztlpn

tests/rptest/tests/e2e_finjector.py

@@ -62,14 +62,6 @@ def start_finjector(self):
         self.finjector_thread.daemon = True
         self.finjector_thread.start()
 
-    def disable_failures(self):
-        self.enable_failures = False
-        self.finjector_thread.join()
-
-    def enable_failures(self):
-        self.enable_failures = True
-        self.start_finjector()
-
     def random_failure_spec(self):
         f_type = random.choice(self.allowed_failures)
         length = self.failure_length_provider(f_type)
@@ -97,3 +89,9 @@ def _failure_injector_loop(self):
             self.redpanda.logger.info(
                 f"waiting {delay} seconds before next failure")
             time.sleep(delay)
+
+    def teardown(self):
+        self.enable_failures = False
+        if self.finjector_thread:
+            self.finjector_thread.join()
+        FailureInjector(self.redpanda)._heal_all()