[fix] Preserve remote skip events for multiple tests #619

Related to #619

Author: czarflix

openwisp_utils/tests/selenium.py

@@ -63,8 +63,8 @@ def _setup_and_call(self, result, debug=False):
             if skip_reasons:
                 for reason in skip_reasons:
                     original_result.addSkip(self, reason)
-                if hasattr(original_result, "events") and hasattr(result, "events"):
-                    original_result.events = result.events
+                if hasattr(original_result, "events"):
+                    original_result.stopTest(self)
                 return
             if result.wasSuccessful():
                 if attempt == 0:

tests/test_project/tests/test_selenium_mixin.py

@@ -1,12 +1,12 @@
-from unittest import TestResult, skip
+from unittest import TestResult, TestSuite, skip
 
 from django.test import SimpleTestCase
-from django.test.runner import RemoteTestResult
+from django.test.runner import RemoteTestRunner
 from openwisp_utils.tests.selenium import SeleniumTestMixin
 
 
 class TestSeleniumMixinSkipHandling(SimpleTestCase):
-    def _run_skipped_test(self, result_class):
+    def _run_skipped_standard_test(self):
         class SkippedSeleniumTest(SeleniumTestMixin, SimpleTestCase):
             retry_max = 0
             retry_delay = 0
@@ -16,20 +16,56 @@ def test_skip(self):
                 pass
 
         test = SkippedSeleniumTest("test_skip")
-        if result_class is RemoteTestResult:
-            result = result_class(stream=None, descriptions=None, verbosity=0)
-        else:
-            result = result_class()
+        result = TestResult()
         test._setup_and_call(result)
         return result
 
+    def _run_skipped_remote_suite(self):
+        class DummyWebDriver:
+            def quit(self):
+                pass
+
+        class SkippedSeleniumTest(SeleniumTestMixin, SimpleTestCase):
+            retry_max = 0
+            retry_delay = 0
+
+            @classmethod
+            def get_webdriver(cls):
+                return DummyWebDriver()
+
+            @skip("first skip propagation regression test")
+            def test_first_skip(self):
+                pass
+
+            @skip("second skip propagation regression test")
+            def test_second_skip(self):
+                pass
+
+        suite = TestSuite(
+            [
+                SkippedSeleniumTest("test_first_skip"),
+                SkippedSeleniumTest("test_second_skip"),
+            ]
+        )
+        return RemoteTestRunner().run(suite)
+
     def test_setup_and_call_propagates_skip_to_standard_result(self):
-        result = self._run_skipped_test(TestResult)
+        result = self._run_skipped_standard_test()
 
         self.assertEqual(len(result.skipped), 1)
         self.assertEqual(result.skipped[0][1], "skip propagation regression test")
 
-    def test_setup_and_call_records_skip_event_for_remote_result(self):
-        result = self._run_skipped_test(RemoteTestResult)
+    def test_setup_and_call_preserves_remote_skip_events_for_multiple_tests(self):
+        result = self._run_skipped_remote_suite()
 
-        self.assertIn(("addSkip", 0, "skip propagation regression test"), result.events)
+        self.assertEqual(
+            result.events,
+            [
+                ("startTest", 0),
+                ("addSkip", 0, "first skip propagation regression test"),
+                ("stopTest", 0),
+                ("startTest", 1),
+                ("addSkip", 1, "second skip propagation regression test"),
+                ("stopTest", 1),
+            ],
+        )