Changeset 276512 in webkit

Timestamp:

Apr 23, 2021, 12:34:35 PM (5 years ago)

Author:

Sam Sneddon

Message:

Add a conftest.py to run existing webkitpy tests in pytest
​https://bugs.webkit.org/show_bug.cgi?id=224687

Reviewed by Jonathan Bedard.

• Scripts/webkitpy/common/system/executive_unittest.py:

(ExecutiveTest.serial_test_run_in_parallel): Deal with the fact that pytest
running the tests might be not be the same version as the autoinstalled version,
and not API compatible.

• Scripts/webkitpy/conftest.py: Added.

(pytest_configure): Define the markers the plugins in conftest use
(pytest_addoption): Add --run-integration to allow them to be disabled by default.
(pytest_pycollect_makeitem): Rename serial/integration tests so pytest finds them.
(pytest_collection_modifyitems): Mark tests as skipped when needed per the above.

• Scripts/webkitpy/pytest.ini: Added.
• Scripts/webkitpy/test/main_unittest.py:

(TestStubs): Stop these from being picked up by pytest as tests.

• Scripts/webkitpy/test/markers.py: Fix this so pytest is technically optional,

even though it is always present because of the autoinstalled copy.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive_unittest.py (modified) (1 diff)
• Scripts/webkitpy/conftest.py (added)
• Scripts/webkitpy/pytest.ini (added)
• Scripts/webkitpy/test/main_unittest.py (modified) (1 diff)
• Scripts/webkitpy/test/markers.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-23  Sam Sneddon  <gsnedders@apple.com>
+
+        Add a conftest.py to run existing webkitpy tests in pytest
+        https://bugs.webkit.org/show_bug.cgi?id=224687
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/common/system/executive_unittest.py:
+        (ExecutiveTest.serial_test_run_in_parallel): Deal with the fact that pytest
+        running the tests might be not be the same version as the autoinstalled version,
+        and not API compatible.
+        * Scripts/webkitpy/conftest.py: Added.
+        (pytest_configure): Define the markers the plugins in conftest use
+        (pytest_addoption): Add --run-integration to allow them to be disabled by default.
+        (pytest_pycollect_makeitem): Rename serial/integration tests so pytest finds them.
+        (pytest_collection_modifyitems): Mark tests as skipped when needed per the above.
+        * Scripts/webkitpy/pytest.ini: Added.
+        * Scripts/webkitpy/test/main_unittest.py:
+        (TestStubs): Stop these from being picked up by pytest as tests.
+        * Scripts/webkitpy/test/markers.py: Fix this so pytest is technically optional,
+        even though it is always present because of the autoinstalled copy.
+
 2021-04-23  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -251 +251 @@
         cwd = os.getcwd()
         commands = [tuple([cmd_line, cwd])] * NUM_PROCESSES
-        start = time.time()
-        command_outputs = Executive().run_in_parallel(commands, processes=NUM_PROCESSES)
-        done = time.time()
+
+        try:
+            # we overwrite __main__ to be this to avoid any issues with
+            # multiprocessing's spawning caused by multiple versions of pytest on
+            # sys.path
+            old_main = sys.modules["__main__"]
+            sys.modules["__main__"] = sys.modules[__name__]
+            start = time.time()
+            command_outputs = Executive().run_in_parallel(commands, processes=NUM_PROCESSES)
+            done = time.time()
+        finally:
+            sys.modules["__main__"] = old_main
+
         self.assertTrue(done - start < NUM_PROCESSES * DELAY_SECS)
         self.assertEqual([output[1] for output in command_outputs], [b'hello\n'] * NUM_PROCESSES)

trunk/Tools/Scripts/webkitpy/test/main_unittest.py

@@ -39 +39 @@
 
 class TestStubs(unittest.TestCase):
+    __pytest_no_rewrite__ = True
+
     def test_empty(self):
         pass

trunk/Tools/Scripts/webkitpy/test/markers.py

@@ -22 +22 @@
 
 import unittest
+
+try:
+    import pytest
+except ImportError:
+    pass