More fixes to tests running with pytest

Summary: First set of fixes came from macOS, this set is from Linux.

Reviewed By: czardoz

Differential Revision: D93486760

fbshipit-source-id: d18b61255fb83f92b757ec05a0f8e28a41ffa33a

Author: alexmalyshev

cinderx/PythonLib/cinderx/test_support.py

@@ -206,6 +206,8 @@ def wrapper(*args: ...) -> None:
                 f"JIT compilation of {func.__qualname__} failed with {exc}"
             )
 
+        wrapper.inner_function = func
+
         return wrapper
 
     return func
@@ -235,6 +237,15 @@ def wrapper(*args: ..., **kwargs: ...) -> TRet:
     return wrapper
 
 
+def is_oss() -> bool:
+    """
+    Check if this is running in an open source environment.
+
+    Currently implemented as looking for the absence of the Meta Python runtime.
+    """
+    return "+meta" not in sys.version and "+cinder" not in sys.version
+
+
 def skip_module_if_oss() -> None:
     """
     Skip a test module on OSS builds, i.e. ones that aren't built with Buck internally at Meta.
@@ -246,10 +257,8 @@ def skip_module_if_oss() -> None:
     (e.g. Meta Python's Lazy Imports).
     """
 
-    if "+meta" in sys.version or "+cinder" in sys.version:
-        return
-
-    raise unittest.SkipTest("Module not compatible with OSS imports")
+    if is_oss():
+        raise unittest.SkipTest("Module not compatible with OSS imports")
 
 
 def has_meta_lazy_imports() -> bool:
@@ -260,6 +269,16 @@ def has_meta_lazy_imports() -> bool:
     return hasattr(importlib, "set_lazy_imports")
 
 
+def undo_fail_decorators(func: Callable[..., object]) -> Callable[..., object]:
+    """
+    Unravel "fail" decorators defined in this module off of a function.
+    """
+
+    while inner_func := getattr(func, "inner_function", None):
+        func = inner_func
+    return func
+
+
 def is_asan_build() -> bool:
     try:
         ctypes.pythonapi.__asan_init
@@ -337,13 +356,8 @@ def assertBytecodeContains(
         expected_opcode: str,
         expected_oparg: int | None = None,
     ) -> None:
-        try:
-            # pyre-ignore[16] - for things wrapped by fail_if_deopt()
-            inner_function = func.inner_function
-        except AttributeError:
-            pass
-        else:
-            func = inner_function
+        # pyre-ignore[6]: func isn't properly typed as a callable yet.
+        func = undo_fail_decorators(func)
 
         bytecode_instructions = dis.get_instructions(func)
 

cinderx/PythonLib/test_cinderx/test_coro_extensions.py

@@ -1,16 +1,18 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
+
 import sys
 import types
 import unittest
 
-from cinderx import test_support as cinder_support
-from cinderx.test_support import passIf, skip_if_jit
+from cinderx.test_support import hasCinderX, passIf, skip_if_jit, skip_module_if_oss
+
+skip_module_if_oss()
 
 # pyre-ignore[21]: can't find test.support
 from test.support import import_helper, maybe_get_event_loop_policy
 
 
-if cinder_support.hasCinderX():
+if hasCinderX():
     import cinder
 
 

cinderx/PythonLib/test_cinderx/test_frame_evaluator.py

@@ -11,16 +11,13 @@
 
 
 CINDERX_INITIALIZED: bool = cinderx.is_initialized()
-ALREADY_INSTALLED: bool = cinderx.is_frame_evaluator_installed()
-JIT_ENABLED: bool = cinderx.jit.is_enabled()
 ARM: bool = "aarch64" in platform.machine() or "arm64" in platform.machine()
 
 
 @passUnless(CINDERX_INITIALIZED, "Need CinderX initialized to test frame evaluator")
-@passIf(ALREADY_INSTALLED, "Can only test frame evaluator with a clean slate")
 class FrameEvaluatorTest(unittest.TestCase):
     def test_install_then_remove(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
+        self.skip_if_already_installed()
 
         cinderx.install_frame_evaluator()
         self.assertTrue(cinderx.is_frame_evaluator_installed())
@@ -29,7 +26,7 @@ def test_install_then_remove(self) -> None:
         self.assertFalse(cinderx.is_frame_evaluator_installed())
 
     def test_idempotent(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
+        self.skip_if_already_installed()
 
         cinderx.install_frame_evaluator()
         self.assertTrue(cinderx.is_frame_evaluator_installed())
@@ -43,39 +40,34 @@ def test_idempotent(self) -> None:
         cinderx.remove_frame_evaluator()
         self.assertFalse(cinderx.is_frame_evaluator_installed())
 
-    @passIf(JIT_ENABLED, "Need to check JIT with a clean slate")
     @passIf(ARM, "JIT doesn't work on ARM yet")
     def test_jit_auto(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
-        self.assertFalse(cinderx.jit.is_enabled())
+        self.skip_if_already_installed()
 
         cinderx.jit.auto()
         self.assertTrue(cinderx.is_frame_evaluator_installed())
 
         cinderx.jit.disable()
         cinderx.remove_frame_evaluator()
 
-    @passIf(JIT_ENABLED, "Need to check JIT with a clean slate")
     @passIf(ARM, "JIT doesn't work on ARM yet")
     def test_jit_compile_after_n_calls(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
-        self.assertFalse(cinderx.jit.is_enabled())
+        self.skip_if_already_installed()
 
         cinderx.jit.compile_after_n_calls(40000)
         self.assertTrue(cinderx.is_frame_evaluator_installed())
 
         cinderx.jit.disable()
         cinderx.remove_frame_evaluator()
 
-    @passIf(JIT_ENABLED, "Need to check JIT with a clean slate")
     @passIf(ARM, "JIT doesn't work on ARM yet")
     def test_jit_force_compile(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
-        self.assertFalse(cinderx.jit.is_enabled())
+        self.skip_if_already_installed()
 
         def foo(a: int, b: int) -> int:
             return a + b
 
+        cinderx.jit.enable()
         cinderx.jit.force_compile(foo)
         self.assertTrue(cinderx.jit.is_jit_compiled(foo))
         self.assertTrue(cinderx.is_frame_evaluator_installed())
@@ -84,15 +76,14 @@ def foo(a: int, b: int) -> int:
         cinderx.jit.disable()
         cinderx.remove_frame_evaluator()
 
-    @passIf(JIT_ENABLED, "Need to check JIT with a clean slate")
     @passIf(ARM, "JIT doesn't work on ARM yet")
     def test_jit_lazy_compile(self) -> None:
-        self.assertFalse(cinderx.is_frame_evaluator_installed())
-        self.assertFalse(cinderx.jit.is_enabled())
+        self.skip_if_already_installed()
 
         def foo(a: int, b: int) -> int:
             return a + b
 
+        cinderx.jit.enable()
         cinderx.jit.lazy_compile(foo)
         self.assertFalse(cinderx.jit.is_jit_compiled(foo))
         self.assertTrue(cinderx.is_frame_evaluator_installed())
@@ -105,6 +96,12 @@ def foo(a: int, b: int) -> int:
         cinderx.jit.disable()
         cinderx.remove_frame_evaluator()
 
+    def skip_if_already_installed(self) -> None:
+        # JIT can be enabled via decorators from other test modules, so this has to
+        # be run inside of the test function and not as a decorator itself.
+        if cinderx.is_frame_evaluator_installed():
+            self.skipTest("Have to test frame evaluator with a clean slate")
+
 
 if __name__ == "__main__":
     unittest.main()

cinderx/PythonLib/test_cinderx/test_jit_coroutines.py

@@ -2,8 +2,6 @@
 
 # pyre-unsafe
 
-# pyre-ignore[21]: Pyre doesn't know about _testcapi
-import _testcapi
 import asyncio
 import dis
 import sys
@@ -15,9 +13,15 @@
     compiles_after_one_call,
     passIf,
     passUnless,
+    skip_module_if_oss,
     skip_unless_jit,
 )
 
+skip_module_if_oss()
+
+# pyre-ignore[21]: Pyre doesn't know about _testcapi
+import _testcapi
+
 # Allow this file to run without CinderX.
 if cinderx.is_initialized():
     from .test_compiler.test_static.common import StaticTestBase

cinderx/PythonLib/test_cinderx/test_jit_preload.py

@@ -8,10 +8,6 @@
 import sys
 import unittest
 
-import cinderx
-
-cinderx.init()
-
 import cinderx.jit
 from cinderx.test_support import (
     ENCODING,

cinderx/PythonLib/test_cinderx/test_jit_support_instrumentation.py

@@ -7,7 +7,9 @@
 from types import CodeType, FrameType
 
 from cinderx.jit import force_compile, is_jit_compiled
-from cinderx.test_support import passUnless, skip_unless_jit
+from cinderx.test_support import passUnless, skip_module_if_oss, skip_unless_jit
+
+skip_module_if_oss()
 
 
 # sys.monitoring is only available in Python 3.12+

cinderx/PythonLib/test_cinderx/test_jitlist.py

@@ -13,7 +13,17 @@
 from pathlib import Path
 
 import cinderx.jit
-from cinderx.test_support import ENCODING, passUnless, skip_unless_jit, subprocess_env
+from cinderx.test_support import (
+    ENCODING,
+    is_oss,
+    passIf,
+    passUnless,
+    skip_unless_jit,
+    subprocess_env,
+)
+
+
+OSS: bool = is_oss()
 
 
 @skip_unless_jit("Tests JIT list behavior")
@@ -128,6 +138,7 @@ def code_func_nojit() -> None:
         code_func_nojit()
         self.assertFalse(cinderx.jit.is_jit_compiled(code_func_nojit))
 
+    @passIf(OSS, "Qualname change events are Meta Python only")
     def test_change_func_qualname(self) -> None:
         # This should be a skipIf decorator, but that makes pyre unhappy for some
         # unknown reason.

cinderx/PythonLib/test_cinderx/test_parallel_gc.py

@@ -6,10 +6,12 @@
 
 import cinderx
 import cinderx.jit
+from cinderx.test_support import passIf, passUnless, skip_module_if_oss
+
+skip_module_if_oss()
 
 # pyre-ignore[21]: Pyre doesn't know about cpython/Lib/test.
 import test.test_gc
-from cinderx.test_support import passIf, passUnless
 
 
 def _restore_parallel_gc(settings: dict[str, int] | None) -> None:

cinderx/PythonLib/test_cinderx/test_perf_profiler_precompile.py

@@ -6,7 +6,9 @@
 import sysconfig
 import unittest
 
-from cinderx.test_support import passIf
+from cinderx.test_support import passIf, skip_module_if_oss
+
+skip_module_if_oss()
 
 # pyre-ignore[21]: can't find test.support
 from test.support.os_helper import temp_dir

cinderx/PythonLib/test_cinderx/test_python314_bytecodes.py

@@ -1,13 +1,14 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 
+import dis
 import opcode
 import sys
 import types
 import unittest
 from typing import Callable
 
 import cinderx.test_support as cinder_support
-from cinderx.test_support import passUnless
+from cinderx.test_support import passUnless, undo_fail_decorators
 
 
 def one():
@@ -405,6 +406,14 @@ def x(a):
             assert a
 
         x(True)
+
+        # pytest overwrites assert statements and destroys LOAD_COMMON_CONSTANT
+        # bytecodes.
+        inner_x = undo_fail_decorators(x)
+        for inst in dis.get_instructions(inner_x):
+            if inst.opname == "LOAD_GLOBAL" and "pytest" in inst.argval:
+                return
+
         self.assertBytecodeContains(x, "LOAD_COMMON_CONSTANT")
 
     def test_LOAD_SPECIAL(self):