|
1 | 1 | import py, os, sys |
2 | 2 | from pytest import raises, skip, mark |
3 | | -from .support import setup_make, pylong, IS_MAC_ARM, IS_MAC_X86, IS_CLANG_REPL, IS_CLANG_DEBUG |
| 3 | +from .support import setup_make, pylong, IS_MAC_ARM, IS_MAC, IS_CLANG_REPL, IS_CLANG_DEBUG |
4 | 4 |
|
5 | 5 |
|
6 | 6 | currpath = py.path.local(__file__).dirpath() |
@@ -230,7 +230,7 @@ def get_value(self): |
230 | 230 | p1 = TPyDerived1() |
231 | 231 | assert p1.get_value() == 13 |
232 | 232 |
|
233 | | - @mark.xfail(run=not IS_MAC_ARM, condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 233 | + @mark.xfail(run=not IS_MAC_ARM, condition=IS_MAC, reason="Fails on OS X") |
234 | 234 | def test08_error_handling(self): |
235 | 235 | """Python errors should propagate through wrapper""" |
236 | 236 |
|
@@ -507,7 +507,7 @@ def __init__(self): |
507 | 507 | assert m.get_data() == 42 |
508 | 508 | assert m.get_data_v() == 42 |
509 | 509 |
|
510 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 510 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
511 | 511 | def test15_object_returns(self): |
512 | 512 | """Return of C++ objects from overridden functions""" |
513 | 513 |
|
@@ -575,7 +575,7 @@ def whoami(self): |
575 | 575 | assert not not new_obj |
576 | 576 | assert new_obj.whoami() == "PyDerived4" |
577 | 577 |
|
578 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 578 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
579 | 579 | def test16_cctor_access_controlled(self): |
580 | 580 | """Python derived class of C++ class with access controlled cctor""" |
581 | 581 |
|
@@ -617,7 +617,7 @@ def whoami(self): |
617 | 617 | obj = PyDerived() |
618 | 618 | assert ns.callit(obj) == "PyDerived" |
619 | 619 |
|
620 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 620 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
621 | 621 | def test17_deep_hierarchy(self): |
622 | 622 | """Test a deep Python hierarchy with pure virtual functions""" |
623 | 623 |
|
@@ -664,7 +664,7 @@ def whoami(self): |
664 | 664 | assert obj.whoami() == "PyDerived4" |
665 | 665 | assert ns.callit(obj) == "PyDerived4" |
666 | 666 |
|
667 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 667 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
668 | 668 | def test18_abstract_hierarchy(self): |
669 | 669 | """Hierarchy with abstract classes""" |
670 | 670 |
|
@@ -997,7 +997,7 @@ def verify(a, n1, n2, n3): |
997 | 997 | a = MyPyDerived(27, 55, nArgs=2) |
998 | 998 | verify(a, 27, 55, 67) |
999 | 999 |
|
1000 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 1000 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
1001 | 1001 | def test23_const_byvalue_return(self): |
1002 | 1002 | """Const by-value return in overridden method""" |
1003 | 1003 |
|
@@ -1241,7 +1241,7 @@ class MyPyDerived(ns.Derived): |
1241 | 1241 | assert obj.calc2() == 2 |
1242 | 1242 | assert ns.callback2(obj) == 2 |
1243 | 1243 |
|
1244 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 1244 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
1245 | 1245 | def test28_cross_deep(self): |
1246 | 1246 | """Deep inheritance hierarchy""" |
1247 | 1247 |
|
|
0 commit comments