summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_util.py4
-rw-r--r--tests/util.py8
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/test_util.py b/tests/test_util.py
index 0a253adfa..f87822a22 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -180,7 +180,7 @@ def test_assert_deepequal():
]
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == TYPE % (
- 'foo', unicode, str, u'hello', 'hello', (0,)
+ 'foo', unicode, str, u'hello', 'hello', (2,)
)
b = [
@@ -200,7 +200,7 @@ def test_assert_deepequal():
]
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == TYPE % (
- 'foo', int, float, 18, 18.0, (2,)
+ 'foo', int, float, 18, 18.0, (0,)
)
# List length mismatch
diff --git a/tests/util.py b/tests/util.py
index 48260dd7c..5a365fbcd 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -286,7 +286,7 @@ def assert_deepequal(expected, got, doc='', stack=tuple()):
type(got) = <type 'str'>
expected = u'how are you?'
got = 'how are you?'
- path = (1, 'world')
+ path = (0, 'world')
"""
if isinstance(expected, tuple):
expected = list(expected)
@@ -301,8 +301,10 @@ def assert_deepequal(expected, got, doc='', stack=tuple()):
raise AssertionError(
LEN % (doc, len(expected), len(got), expected, got, stack)
)
- for (i, e_sub) in enumerate(expected):
- g_sub = got[i]
+ s_got = sorted(got)
+ s_expected = sorted(expected)
+ for (i, e_sub) in enumerate(s_expected):
+ g_sub = s_got[i]
assert_deepequal(e_sub, g_sub, doc, stack + (i,))
elif isinstance(expected, dict):
missing = set(expected).difference(got)