IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_util.test_assert_deepequal test

Browse Source 
The test would be failing because recent pretty-print changes
that caused the inner members of a dictionary to be printed
in a different order.

https://fedorahosted.org/freeipa/ticket/6373

Reviewed-By: Lenka Doudova <ldoudova@redhat.com>
This commit is contained in:
Stanislav Laznicka
2016-10-03 09:04:24 +02:00
committed by Martin Basti
parent aed346a359
commit 6982929c20
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ipatests/test_util.py
View File

@@ -140,6 +140,17 @@ class test_Fuzzy(object):
def test_assert_deepequal():
f = util.assert_deepequal
# pylint: disable=no-member
pretty = pytest.config.getoption("pretty_print")
# LEN and KEYS formats use special function to pretty print structures
# depending on a pytest environment settings
def got_str(s):
return util.struct_to_string(s, util.GOT_LEN) if pretty else str(s)
def exp_str(s):
ret = util.struct_to_string(s, util.EXPECTED_LEN) if pretty else str(s)
return ret
# Test with good scalar values:
f(u'hello', u'hello')
@@ -221,7 +232,7 @@ def test_assert_deepequal():
]
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == LEN % (
'foo', 3, 4, a, b, tuple()
'foo', 3, 4, exp_str(a), got_str(b), tuple()
)
b = [
@@ -230,7 +241,7 @@ def test_assert_deepequal():
]
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == LEN % (
'foo', 3, 2, a, b, tuple()
'foo', 3, 2, exp_str(a), got_str(b), tuple()
)
# Dict keys mismatch:
@@ -244,7 +255,7 @@ def test_assert_deepequal():
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == KEYS % ('foo',
['naughty'], [],
dict(naughty=u'nurse'), dict(),
exp_str(dict(naughty=u'nurse')), got_str(dict()),
(1,)
)
@@ -257,7 +268,8 @@ def test_assert_deepequal():
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == KEYS % ('foo',
[], ['barely'],
dict(naughty=u'nurse'), dict(naughty=u'nurse', barely=u'legal'),
exp_str(dict(naughty=u'nurse')),
got_str(dict(naughty=u'nurse', barely=u'legal')),
(1,)
)
@@ -270,7 +282,7 @@ def test_assert_deepequal():
e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == KEYS % ('foo',
['naughty'], ['barely'],
dict(naughty=u'nurse'), dict(barely=u'legal'),
exp_str(dict(naughty=u'nurse')), got_str(dict(barely=u'legal')),
(1,)
)