fix test suite (pytest changes in ExceptionInfo class)

This commit is contained in:
Wenzel Jakob 2019-07-06 16:57:17 +02:00
parent 8b90b1da62
commit 9fd4712121
4 changed files with 14 additions and 13 deletions

View File

@ -679,10 +679,10 @@ def test_issue1105():
# These should still fail (incompatible dimensions): # These should still fail (incompatible dimensions):
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.iss1105_row(np.ones((7, 1))) m.iss1105_row(np.ones((7, 1)))
assert "incompatible function arguments" in str(excinfo) assert "incompatible function arguments" in str(excinfo.value)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.iss1105_col(np.ones((1, 7))) m.iss1105_col(np.ones((1, 7)))
assert "incompatible function arguments" in str(excinfo) assert "incompatible function arguments" in str(excinfo.value)
def test_custom_operator_new(): def test_custom_operator_new():

View File

@ -220,7 +220,7 @@ def test_cross_module_calls():
c, d = m.MixGL2(3), cm.MixGL2(4) c, d = m.MixGL2(3), cm.MixGL2(4)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.get_gl_value(c) m.get_gl_value(c)
assert "incompatible function arguments" in str(excinfo) assert "incompatible function arguments" in str(excinfo.value)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.get_gl_value(d) m.get_gl_value(d)
assert "incompatible function arguments" in str(excinfo) assert "incompatible function arguments" in str(excinfo.value)

View File

@ -100,32 +100,32 @@ def test_properties():
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
dummy = instance.def_property_writeonly # noqa: F841 unused var dummy = instance.def_property_writeonly # noqa: F841 unused var
assert "unreadable attribute" in str(excinfo) assert "unreadable attribute" in str(excinfo.value)
instance.def_property_writeonly = 4 instance.def_property_writeonly = 4
assert instance.def_property_readonly == 4 assert instance.def_property_readonly == 4
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
dummy = instance.def_property_impossible # noqa: F841 unused var dummy = instance.def_property_impossible # noqa: F841 unused var
assert "unreadable attribute" in str(excinfo) assert "unreadable attribute" in str(excinfo.value)
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
instance.def_property_impossible = 5 instance.def_property_impossible = 5
assert "can't set attribute" in str(excinfo) assert "can't set attribute" in str(excinfo.value)
def test_static_properties(): def test_static_properties():
assert m.TestProperties.def_readonly_static == 1 assert m.TestProperties.def_readonly_static == 1
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
m.TestProperties.def_readonly_static = 2 m.TestProperties.def_readonly_static = 2
assert "can't set attribute" in str(excinfo) assert "can't set attribute" in str(excinfo.value)
m.TestProperties.def_readwrite_static = 2 m.TestProperties.def_readwrite_static = 2
assert m.TestProperties.def_readwrite_static == 2 assert m.TestProperties.def_readwrite_static == 2
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
dummy = m.TestProperties.def_writeonly_static # noqa: F841 unused var dummy = m.TestProperties.def_writeonly_static # noqa: F841 unused var
assert "unreadable attribute" in str(excinfo) assert "unreadable attribute" in str(excinfo.value)
m.TestProperties.def_writeonly_static = 3 m.TestProperties.def_writeonly_static = 3
assert m.TestProperties.def_readonly_static == 3 assert m.TestProperties.def_readonly_static == 3
@ -133,14 +133,14 @@ def test_static_properties():
assert m.TestProperties.def_property_readonly_static == 3 assert m.TestProperties.def_property_readonly_static == 3
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
m.TestProperties.def_property_readonly_static = 99 m.TestProperties.def_property_readonly_static = 99
assert "can't set attribute" in str(excinfo) assert "can't set attribute" in str(excinfo.value)
m.TestProperties.def_property_static = 4 m.TestProperties.def_property_static = 4
assert m.TestProperties.def_property_static == 4 assert m.TestProperties.def_property_static == 4
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
dummy = m.TestProperties.def_property_writeonly_static dummy = m.TestProperties.def_property_writeonly_static
assert "unreadable attribute" in str(excinfo) assert "unreadable attribute" in str(excinfo.value)
m.TestProperties.def_property_writeonly_static = 5 m.TestProperties.def_property_writeonly_static = 5
assert m.TestProperties.def_property_static == 5 assert m.TestProperties.def_property_static == 5
@ -158,7 +158,7 @@ def test_static_properties():
with pytest.raises(AttributeError) as excinfo: with pytest.raises(AttributeError) as excinfo:
dummy = instance.def_property_writeonly_static # noqa: F841 unused var dummy = instance.def_property_writeonly_static # noqa: F841 unused var
assert "unreadable attribute" in str(excinfo) assert "unreadable attribute" in str(excinfo.value)
instance.def_property_writeonly_static = 4 instance.def_property_writeonly_static = 4
assert instance.def_property_static == 4 assert instance.def_property_static == 4

View File

@ -272,7 +272,8 @@ def test_smart_ptr_from_default():
instance = m.HeldByDefaultHolder() instance = m.HeldByDefaultHolder()
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.HeldByDefaultHolder.load_shared_ptr(instance) m.HeldByDefaultHolder.load_shared_ptr(instance)
assert "Unable to load a custom holder type from a default-holder instance" in str(excinfo) assert "Unable to load a custom holder type from a " \
"default-holder instance" in str(excinfo.value)
def test_shared_ptr_gc(): def test_shared_ptr_gc():