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

test_util: str/bytes check fixes for Python 3

Browse Source 
https://fedorahosted.org/freeipa/ticket/5638

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin 2016-01-26 15:32:29 +01:00 committed by Jan Cholasta
parent 4b104c742b
commit c3529355a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipatests/test_util.py
View File

@ -158,9 +158,9 @@ def test_assert_deepequal():
'foo', u'hello', u'world', tuple() 'foo', u'hello', u'world', tuple()
) )
e = raises(AssertionError, f, 'hello', u'hello', 'foo') e = raises(AssertionError, f, b'hello', u'hello', 'foo')
assert str(e) == TYPE % ( assert str(e) == TYPE % (
'foo', str, unicode, 'hello', u'hello', tuple() 'foo', bytes, unicode, b'hello', u'hello', tuple()
) )
e = raises(AssertionError, f, 18, 18.0, 'foo') e = raises(AssertionError, f, 18, 18.0, 'foo')
@ -183,7 +183,7 @@ def test_assert_deepequal():
# Test with bad compound values: # Test with bad compound values:
b = [ b = [
'hello', b'hello',
dict(naughty=u'nurse'), dict(naughty=u'nurse'),
18, 18,
] ]
@ -194,12 +194,12 @@ def test_assert_deepequal():
b = [ b = [
u'hello', u'hello',
dict(naughty='nurse'), dict(naughty=b'nurse'),
18, 18,
] ]
e = raises(AssertionError, f, a, b, 'foo') e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == TYPE % ( assert str(e) == TYPE % (
'foo', unicode, str, u'nurse', 'nurse', (1, 'naughty') 'foo', unicode, bytes, u'nurse', b'nurse', (1, 'naughty')
) )
b = [ b = [
@ -209,7 +209,7 @@ def test_assert_deepequal():
] ]
e = raises(AssertionError, f, a, b, 'foo') e = raises(AssertionError, f, a, b, 'foo')
assert str(e) == TYPE % ( assert str(e) == TYPE % (
b'foo', int, float, 18, 18.0, (0 if six.PY2 else 2,) 'foo', int, float, 18, 18.0, (0 if six.PY2 else 2,)
) )
# List length mismatch # List length mismatch