traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The MRO conflict error message depends on dictionary hash order. 

Avoid depending on this in the test.
This commit is contained in:
Guido van Rossum 2002-11-27 04:00:59 +00:00
parent 4add68bbbc
commit a01fa26396
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_descr.py
View File

@ -1060,7 +1060,7 @@ def mro_disagreement():
try:
callable(*args)
except exc, msg:
if str(msg) != expected:
if not str(msg).startswith(expected):
raise TestFailed, "Message %r, expected %r" % (str(msg),
expected)
else:
@ -1071,9 +1071,9 @@ def mro_disagreement():
# Test some very simple errors
raises(TypeError, "duplicate base class A",
type, "X", (A, A), {})
raises(TypeError, "MRO conflict among bases B, A",
raises(TypeError, "MRO conflict among bases ",
type, "X", (A, B), {})
raises(TypeError, "MRO conflict among bases C, B, A",
raises(TypeError, "MRO conflict among bases ",
type, "X", (A, C, B), {})
# Test a slightly more complex error
class GridLayout(object): pass
@ -1081,7 +1081,7 @@ def mro_disagreement():
class VerticalGrid(GridLayout): pass
class HVGrid(HorizontalGrid, VerticalGrid): pass
class VHGrid(VerticalGrid, HorizontalGrid): pass
raises(TypeError, "MRO conflict among bases VerticalGrid, HorizontalGrid",
raises(TypeError, "MRO conflict among bases ",
type, "ConfusedGrid", (HVGrid, VHGrid), {})
def objects():