Simplify hard-to-read test tags with IS_CLING

aaronj0 · aaronj0 · commit 67a1af459532 · 2025-04-02T11:46:13.000+02:00
diff --git a/test/support.py b/test/support.py
@@ -73,3 +73,4 @@ def setup_make(targetname):
                                             #else
                                             true
                                             #endif\n""") == 1)
+IS_CLING = not IS_CLANG_REPL
diff --git a/test/test_conversions.py b/test/test_conversions.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make
+from .support import setup_make, IS_LINUX, IS_CLANG_REPL, IS_CLING, IS_MAC
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("conversionsDict"))
@@ -87,7 +87,7 @@ def test03_error_handling(self):
         gc.collect()
         assert CC.s_count == 0
 
-    @mark.xfail(condition = IS_MAC and IS_CLANG_REPL)
+    @mark.xfail(run = not(IS_LINUX and IS_CLING), condition = ((IS_MAC and IS_CLANG_REPL) or (IS_LINUX and IS_CLING)), reason = "Fails on OS X + Clang-Repl, Crashes on Linux + Cling")
     def test04_implicit_conversion_from_tuple(self):
         """Allow implicit conversions from tuples as arguments {}-like"""
 
diff --git a/test/test_cpp11features.py b/test/test_cpp11features.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_MAC
+from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_MAC, IS_CLING
 
 
 currpath = py.path.local(__file__).dirpath()
@@ -433,7 +433,7 @@ def test14_shared_ptr_passing(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition=(IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
     def test15_unique_ptr_template_deduction(self):
         """Argument type deduction with std::unique_ptr"""
 
diff --git a/test/test_crossinheritance.py b/test/test_crossinheritance.py
@@ -1033,7 +1033,7 @@ def return_const(self):
         assert a.return_const().m_value == "abcdef"
         assert ns.callit(a).m_value     == "abcdef"
 
-    @mark.xfail(condition = IS_MAC and IS_CLANG_REPL)
+    @mark.xfail(condition = IS_MAC and IS_CLANG_REPL, reason = "Fails on OS X Clang-REPL")
     def test24_non_copyable(self):
         """Inheriting from a non-copyable base class"""
 
diff --git a/test/test_datatypes.py b/test/test_datatypes.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, pylong, pyunicode, IS_CLANG_REPL, IS_MAC_X86, IS_MAC_ARM, IS_MAC, IS_LINUX
+from .support import setup_make, pylong, pyunicode, IS_CLANG_REPL, IS_CLING, IS_MAC_X86, IS_MAC_ARM, IS_MAC, IS_LINUX
 
 IS_MAC = IS_MAC_X86 or IS_MAC_ARM
 
@@ -1643,7 +1643,7 @@ def test31_anonymous_union(self):
         assert type(p.data_c[0]) == float
         assert p.intensity == 5.
 
-    @mark.xfail(condition=not IS_CLANG_REPL, reason="Fails on Cling")
+    @mark.xfail(condition=IS_CLING, reason="Fails on Cling")
     def test32_anonymous_struct(self):
         """Anonymous struct creates an unnamed type"""
 
@@ -2096,7 +2096,7 @@ def pycompdot(a, b, N):
             Ccl = func(Acl, Bcl, 2)
             assert complex(Ccl) == pyCcl
 
-    @mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition=(IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
     def test42_mixed_complex_arithmetic(self):
         """Mixin of Python and C++ std::complex in arithmetic"""
 
diff --git a/test/test_doc_features.py b/test/test_doc_features.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, ispypy, IS_WINDOWS, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC, IS_MAC_X86, IS_MAC_ARM, IS_LINUX_ARM
+from .support import setup_make, ispypy, IS_WINDOWS, IS_CLANG_REPL, IS_CLING, IS_CLANG_DEBUG, IS_MAC, IS_MAC_X86, IS_MAC_ARM, IS_LINUX_ARM
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("doc_helperDict"))
@@ -9,7 +9,7 @@ def setup_module(mod):
     setup_make("doc_helper")
 
 
-@mark.skipif((IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason="setup class fails with OS X cling")
+@mark.skipif(IS_MAC and IS_CLING, reason="setup class fails with OS X cling")
 class TestDOCFEATURES:
     def setup_class(cls):
         cls.test_dct = test_dct
@@ -485,7 +485,7 @@ def test_exceptions(self):
         assert caught == True
 
 
-@mark.skipif((IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason="setup class fails with OS X cling")
+@mark.skipif(IS_MAC and IS_CLING, reason="setup class fails with OS X cling")
 class TestTUTORIALFEATURES:
     def setup_class(cls):
         import cppyy
@@ -574,7 +574,7 @@ def test02_python_introspection(self):
         assert not isinstance(i, int)
         assert isinstance(i, Integer1)
 
-    @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling")
+    @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and IS_CLING, reason= "Crashes on OS X Cling")
     def test03_STL_containers(self):
         """Instantiate STL containers with new class"""
 
@@ -612,7 +612,7 @@ def pythonizor(klass, name):
         i2 = Integer2(13)
         assert int(i2) == 13
 
-    @mark.xfail(condition=IS_MAC and not IS_CLANG_REPL, reason="Fails on OSX Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OSX Cling")
     def test06_add_operator(self):
         """Add operator+"""
 
@@ -735,7 +735,7 @@ def test10_stl_algorithm(self):
         assert n == 'thisisaC++stringing'
 
 
-@mark.skipif((IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason="setup class fails with OS X cling")
+@mark.skipif(IS_MAC and IS_CLING, reason="setup class fails with OS X cling")
 class TestADVERTISED:
     def setup_class(cls):
         import cppyy
@@ -850,7 +850,7 @@ def test03_use_of_ctypes_and_enum(self):
         assert list(arr) == [1, 42, 1, 42]
         cppyy.gbl.free(vp)
 
-    @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and (not IS_CLANG_REPL), reason= "Crashes on OS X Cling")
+    @mark.xfail(run=(not IS_MAC and IS_CLANG_REPL), condition=IS_MAC and IS_CLING, reason= "Crashes on OS X Cling")
     def test04_ptr_ptr_python_owns(self):
         """Example of ptr-ptr use where python owns"""
 
@@ -1074,7 +1074,7 @@ def produce_imp(self):
 
 # The series of tests below mostly exists already in other places, but these
 # were used as examples for the CaaS' cppyy presentation and are preserved here.
-@mark.skipif((IS_MAC_ARM or IS_MAC_X86) and (not IS_CLANG_REPL), reason="setup class fails with OS X cling")
+@mark.skipif(IS_MAC and IS_CLING, reason="setup class fails with OS X cling")
 class TestTALKEXAMPLES:
     def setup_class(cls):
         import cppyy
diff --git a/test/test_eigen.py b/test/test_eigen.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import mark, raises
-from .support import setup_make, IS_CLANG_REPL, IS_MAC_X86
+from .support import setup_make, IS_CLANG_REPL, IS_CLING, IS_MAC_X86
 
 inc_paths = [os.path.join(os.path.sep, 'usr', 'include'),
              os.path.join(os.path.sep, 'usr', 'local', 'include')]
@@ -158,7 +158,7 @@ def setup_class(cls):
             warnings.simplefilter('ignore')
             cppyy.include('Eigen/Dense')
 
-    @mark.xfail(condition=IS_MAC_X86 and (not IS_CLANG_REPL), reason="Errors out on OS X Cling")
+    @mark.xfail(condition=IS_MAC_X86 and IS_CLING, reason="Errors out on OS X Cling")
     def test01_use_of_Map(self):
         """Use of Map (used to crash)"""
 
diff --git a/test/test_operators.py b/test/test_operators.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, pylong, maxvalue, IS_WINDOWS, IS_MAC, IS_CLANG_REPL
+from .support import setup_make, pylong, maxvalue, IS_WINDOWS, IS_MAC, IS_CLANG_REPL, IS_CLING
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("operatorsDict"))
@@ -337,7 +337,7 @@ def test14_single_argument_call(self):
         b = ns.Bar()
         assert b[42] == 42
 
-    @mark.xfail(condition = (IS_MAC and not IS_CLANG_REPL), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = (IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
     def test15_class_and_global_mix(self):
         """Iterator methods have both class and global overloads"""
 
diff --git a/test/test_pythonify.py b/test/test_pythonify.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, pylong, ispypy, IS_CLANG_REPL, IS_MAC_ARM, IS_MAC_X86, IS_MAC
+from .support import setup_make, pylong, ispypy, IS_CLANG_REPL, IS_CLING, IS_MAC_ARM, IS_MAC_X86, IS_MAC
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("example01Dict"))
@@ -379,7 +379,7 @@ def __init__(self, what):
 
         assert example01.getCount() == 0
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition = IS_MAC and IS_CLING, reason = "Fails on OS X Cling")
     def test17_chaining(self):
         """Respective return values of temporaries should not go away"""
 
@@ -496,7 +496,7 @@ def verify_b(b, val, ti, to):
         with raises(TypeError):
             c.callme(a=1, b=2)
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) or IS_MAC, reason="Fails on Cling and OSX")
+    @mark.xfail(condition=IS_MAC or IS_CLING, reason="Fails on Cling and OSX")
     def test19_keywords_and_defaults(self):
         """Use of keyword arguments mixed with defaults"""
 
diff --git a/test/test_pythonization.py b/test/test_pythonization.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make, pylong, IS_MAC_X86, IS_MAC_ARM, IS_MAC, IS_CLANG_REPL
+from .support import setup_make, pylong, IS_MAC_X86, IS_MAC_ARM, IS_MAC, IS_CLANG_REPL, IS_CLING
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("pythonizablesDict"))
@@ -63,7 +63,7 @@ def root_pythonizor(klass, name):
 
         assert len(cppyy.gbl.CppyyLegacy.TObjString("aap")) == 4     # include '\0'
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test01_size_mapping(self):
         """Use composites to map GetSize() onto buffer returns"""
 
@@ -87,7 +87,7 @@ def set_size(self, buf):
         assert len(y) == bsize
         assert list(y) == list(map(lambda x: x*yval, range(bsize)))
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test02_size_mapping_of_templated_method(self):
         """Use composites to map GetSize() onto buffer returns"""
 
@@ -111,7 +111,7 @@ def set_size(self, buf):
         assert len(y) == bsize
         assert list(y) == list(map(lambda x: x*yval, range(bsize)))
 
-    @mark.xfail(condition=IS_MAC and not IS_CLANG_REPL, reason="fails on OSX-Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="fails on OSX-Cling")
     def test03_type_pinning(self):
         """Verify pinnability of returns"""
 
@@ -197,7 +197,7 @@ def test06_executors(self):
         assert mine.__smartptr__().get().m_check == 0xcdcdcdcd
         assert mine.say_hi() == "Hi!"
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test07_creates_flag(self):
         """Effect of creates flag on return type"""
 
@@ -219,7 +219,7 @@ def test07_creates_flag(self):
 
         assert Countable.sInstances == oldcount
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test08_base_class_pythonization(self):
         """Derived class should not re-pythonize base class pythonization"""
 
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -1,6 +1,6 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, IS_WINDOWS, ispypy, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC
+from .support import setup_make, IS_WINDOWS, ispypy, IS_CLANG_REPL, IS_CLING, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC
 
 
 class TestREGRESSION:
@@ -185,7 +185,7 @@ def test07_class_refcounting(self):
 
         assert sys.getrefcount(x) == old_refcnt
 
-    @mark.xfail(run=not((IS_MAC_ARM or IS_MAC_X86) and not IS_CLANG_REPL))
+    @mark.xfail(run=not(IS_MAC and IS_CLING))
     def test08_typedef_identity(self):
         """Nested typedefs should retain identity"""
 
@@ -205,7 +205,7 @@ def test08_typedef_identity(self):
         assert not 'vector<const PyABC::S1*>' in dir(PyABC.S2)
         assert PyABC.S2.S1_coll is cppyy.gbl.std.vector('const PyABC::S1*')
 
-    @mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
+    @mark.xfail(condition=(IS_MAC and IS_CLING), reason="fails on OSX-Cling")
     def test09_gil_not_released(self):
         """GIL was released by accident for by-value returns"""
 
@@ -228,7 +228,7 @@ def test09_gil_not_released(self):
         cppyy.cppdef(code)
         cppyy.gbl.some_foo_calling_python()
 
-    @mark.skipif(not IS_CLANG_REPL, reason="Crashes on Cling")
+    @mark.xfail(run = False, condition = IS_CLING, reason="Crashes on Cling")
     def test10_enum_in_global_space(self):
         """Enum declared in search.h did not appear in global space"""
 
@@ -684,7 +684,7 @@ def test24_C_style_enum(self):
         CSE.your_enum = CSE.YourEnum.kFour
         assert CSE.your_enum == CSE.YourEnum.kFour
 
-    @mark.xfail(condition=IS_MAC and not IS_CLANG_REPL, reason="Fails with OSX-Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails with OSX-Cling")
     def test25_const_iterator(self):
         """const_iterator failed to resolve the proper return type"""
 
@@ -739,7 +739,7 @@ def test26_const_charptr_data(self):
         with raises(TypeError):
             io.BackendPlatformName = "aap"
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test27_exception_by_value(self):
         """Proper memory management of exception return by value"""
 
@@ -775,7 +775,7 @@ class Countable : std::exception {
         gc.collect()
         assert ns.count() == 0
 
-    @mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
     def test28_exception_as_shared_ptr(self):
         """shared_ptr of an exception object null-checking"""
 
@@ -791,7 +791,7 @@ def test28_exception_as_shared_ptr(self):
         null = cppyy.gbl.exception_as_shared_ptr.get_shared_null()
         assert not null
 
-    @mark.xfail(run=False, condition=(not IS_CLANG_REPL and IS_MAC) or IS_MAC_ARM, reason="Dispatcher fix #53 introduces canonical types with std:: namespace that introduces OS X exceptions similar to test_stltypes")
+    @mark.xfail(run=False, condition=(IS_CLING and IS_MAC) or IS_MAC_ARM, reason="Dispatcher fix #53 introduces canonical types with std:: namespace that introduces OS X exceptions similar to test_stltypes")
     def test29_callback_pointer_values(self):
         """Make sure pointer comparisons in callbacks work as expected"""
 
@@ -1015,7 +1015,7 @@ def test34_print_empty_collection(self):
         v = cppyy.gbl.std.vector[int]()
         str(v)
 
-    @mark.xfail(run=IS_CLANG_REPL, condition=IS_MAC or not IS_CLANG_REPL, reason="Crashes on Cling")
+    @mark.xfail(run=IS_CLANG_REPL, condition=IS_MAC or IS_CLING, reason="Crashes on Cling")
     def test35_filesytem(self):
         """Static path object used to crash on destruction"""
 
@@ -1088,7 +1088,7 @@ def test37_array_of_pointers_argument(self):
 
             assert cppyy.addressof(res) == cppyy.addressof(arr)
 
-    @mark.xfail(run = False, condition = (IS_MAC and not IS_CLANG_REPL), reason = "Crashes on OS X Cling")
+    @mark.xfail(run = False, condition = (IS_MAC and IS_CLING), reason = "Crashes on OS X Cling")
     def test38_char16_arrays(self):
         """Access to fixed-size char16 arrays as data members"""
 
diff --git a/test/test_stltypes.py b/test/test_stltypes.py
diff --git a/test/test_templates.py b/test/test_templates.py
