Skip to content

Commit

Permalink
Fixing merge accident related to merging PR #3059 from master.
Browse files Browse the repository at this point in the history
I did not go back to check when and why exactly this slipped in.

Also removing unused `msg` (oversight in PR #3059).
  • Loading branch information
Ralf W. Grosse-Kunstleve committed Jun 30, 2021
1 parent c2111fd commit 94f0db5
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions tests/test_methods_and_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,18 +433,7 @@ def test_accepts_none(msg):
assert m.ok_none4(None) == -1


def test_casts_none(msg):
"""#2778: implicit casting from None to object (not pointer)"""
a = m.NoneCastTester()
assert m.ok_obj_or_none(a) == -1
a = m.NoneCastTester(4)
assert m.ok_obj_or_none(a) == 4
a = m.NoneCastTester(None)
assert m.ok_obj_or_none(a) == -1
assert m.ok_obj_or_none(None) == -1


def test_casts_none(msg):
def test_casts_none():
"""#2778: implicit casting from None to object (not pointer)"""
a = m.NoneCastTester()
assert m.ok_obj_or_none(a) == -1
Expand Down

0 comments on commit 94f0db5

Please sign in to comment.