Skip to content

Fix #880 #945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slozier merged 2 commits into from
Sep 23, 2020
Merged

Fix #880 #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaedc71
provide more specific test file location
komodo472 Sep 23, 2020
6b6dcbd
Replace assertUnreachable with fail #880
komodo472 Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Src/IronPythonTest/Cases/CaseGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public IEnumerator GetEnumerator() {
.SetCategory(category)
.SetName(name)
.Returns(0);
result.Properties.Add("_CodeFilePath", testcase.Path);

var runIgnored = !string.IsNullOrWhiteSpace(TestContext.Parameters["RUN_IGNORED"]);

Expand Down
10 changes: 5 additions & 5 deletions Tests/interop/net/method/test_operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ def test_all_ops(self):
z = AllOpsClass(-6)

#if x: pass
#else: self.assertUnreachable()
#else: self.fail("Unreachable code reached")
#
#Flag.Check(100)
#
#if z: self.assertUnreachable()
#if z: self.fail("Unreachable code reached")
#else: pass
#
#Flag.Check(100)
#
#if not x: self.assertUnreachable()
#if not x: self.fail("Unreachable code reached")
#else: pass
#
#Flag.Check(100)
#
#if not z: pass
#else: self.assertUnreachable()
#else: self.fail("Unreachable code reached")
#
#Flag.Check(100)

Expand Down Expand Up @@ -288,4 +288,4 @@ def test_python_style(self):
self.assertEqual(AllOpsClass.__gt__(x, y), True); Flag.Check(310)
self.assertEqual(AllOpsClass.__ge__(x, y), True); Flag.Check(340)

run_test(__name__)
run_test(__name__)
6 changes: 3 additions & 3 deletions Tests/interop/net/type/test_reachtype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def test_interesting_names_as_class_name(self):
def test_nothing_public(self):
try:
import NothingPublic
self.assertUnreachable()
self.fail("Unreachable code reached")
except ImportError:
pass

Expand Down Expand Up @@ -129,7 +129,7 @@ def test_type_without_namespace(self):
# internal type
try:
import InternalRefTypeWithoutNS
self.assertUnreachable()
self.fail("Unreachable code reached")
except ImportError:
pass

Expand Down Expand Up @@ -206,7 +206,7 @@ def test_type_causing_load_exception(self):
B = 10
try:
from PossibleLoadException import B
self.assertUnreachable()
self.fail("Unreachable code reached")
except ImportError:
pass

Expand Down
2 changes: 1 addition & 1 deletion Tests/modules/io_related/test_cPickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ def persistent_load(id):
# exceptions vary between cPickle & Pickle
try:
up.load()
self.assertUnreachable()
self.fail("Unreachable code reached")
except Exception as e:
pass

Expand Down
6 changes: 3 additions & 3 deletions Tests/modules/misc/test__weakref.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class C: pass
try:
type(wr).__add__.__get__(wr, None)() # object is dead, should throw
except: pass
else: self.assertUnreachable()
else: self.fail("Unreachable code reached")


# kwarg call
Expand All @@ -100,14 +100,14 @@ def __add__(self, other):
try:
type(x).__sub__.__get(x, None)('abc')
except AttributeError: pass
else: self.assertUnreachable()
else: self.fail("Unreachable code reached")

if is_cli: # cli accepts kw-args everywhere
# calling non-existent method should raise attribute error (kw-arg version)
try:
type(x).__sub__.__get(x, None)(other='abc')
except AttributeError: pass
else: self.assertUnreachable()
else: self.fail("Unreachable code reached")

def test_slot_repr(self):
class C: pass
Expand Down
2 changes: 1 addition & 1 deletion Tests/modules/type_related/test__struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def test_new_init(self):
a = _struct.Struct('c')
try:
a.__init__('bad')
self.assertUnreachable()
self.fail("Unreachable code reached")
except _struct.error as e:
pass

Expand Down
60 changes: 30 additions & 30 deletions Tests/test_builtinfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,22 +552,22 @@ def test_eval(self):

try:
eval('1+')
self.assertUnreachable()
self.fail("Unreachable code reached")
except Exception as exp:
pass
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

# gh1636 - don't use self.assertRaises since it hides the error
zzz = 1
try:
eval("zzz", {})
self.assertUnreachable()
self.fail("Unreachable code reached")
except NameError:
pass
try:
eval("zzz", {}, None)
self.assertUnreachable()
self.fail("Unreachable code reached")
except NameError:
pass

Expand Down Expand Up @@ -791,11 +791,11 @@ def test_round(self):

try:
round(number=2.5, ndigits=1.1)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("'float' object cannot be interpreted as an integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

# type implements __round__
# correct number of arguments
Expand All @@ -814,47 +814,47 @@ def test_round(self):
# too many arguments
try:
round(roundable, 1, 2)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("round() takes at most 2 arguments (3 given)", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

# type does not implement __round__
# too few arguments
try:
round(self.NotRoundable())
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("type NotRoundable doesn't define __round__ method", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

# correct number of arguments
try:
round(self.NotRoundable(), 1)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("type NotRoundable doesn't define __round__ method", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(number=self.NotRoundable(), ndigits=1)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("type NotRoundable doesn't define __round__ method", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

# too many arguments
try:
round(self.NotRoundable(), 1, 2)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("round() takes at most 2 arguments (3 given)", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

self.assertEqualAndCheckType(round(3), 3, int)
self.assertEqualAndCheckType(round(3, 0), 3, int)
Expand Down Expand Up @@ -892,51 +892,51 @@ def test_round(self):

try:
round(number=2, ndigits=1.1)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("'float' object cannot be interpreted as an integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(number=111111111111111111111111111111, ndigits=1.1)
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("'float' object cannot be interpreted as an integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(float('nan'))
self.assertUnreachable()
self.fail("Unreachable code reached")
except ValueError as err:
self.assertEqual("cannot convert float NaN to integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(float('inf'))
self.assertUnreachable()
self.fail("Unreachable code reached")
except OverflowError as err:
self.assertEqual("cannot convert float infinity to integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(float('-inf'))
self.assertUnreachable()
self.fail("Unreachable code reached")
except OverflowError as err:
self.assertEqual("cannot convert float infinity to integer", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

try:
round(sys.float_info.max, -307)
self.assertUnreachable()
self.fail("Unreachable code reached")
except OverflowError as err:
self.assertEqual("rounded value too large to represent", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

actual = round(float('inf'), 1)
self.assertTrue(math.isinf(actual) and actual > 0)
Expand Down Expand Up @@ -981,11 +981,11 @@ def test_round(self):

try:
round(5.5, self.NonIntegralIndex())
self.assertUnreachable()
self.fail("Unreachable code reached")
except TypeError as err:
self.assertEqual("__index__ returned non-int (type str)", str(err))
else:
self.assertUnreachable()
self.fail("Unreachable code reached")

def test_cp16000(self):
class K(object):
Expand Down
Loading