Simplify hard-to-read test tags with IS_CLING

Author: aaronj0

test/support.py

@@ -73,3 +73,4 @@ def setup_make(targetname):
                                             #else
                                             true
                                             #endif\n""") == 1)
+IS_CLING = not IS_CLANG_REPL

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"""
 

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"""
 

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"""
 

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"""
 

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

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)"""
 

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"""
 

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"""
 

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"""