diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-02-10 13:29:52 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-02-11 13:36:15 -0500 |
| commit | 3ac3130fc9daf853368947b268d9af4b8a67d247 (patch) | |
| tree | 404d1bdf4814e6e9b58394049d1c377c7a75f7af /tests | |
| parent | b069af3bc9fe5ad91c01a0d7b4f7c9d833291e23 (diff) | |
| download | freeipa-3ac3130fc9daf853368947b268d9af4b8a67d247.tar.gz freeipa-3ac3130fc9daf853368947b268d9af4b8a67d247.tar.xz freeipa-3ac3130fc9daf853368947b268d9af4b8a67d247.zip | |
Convert json strings to unicode when they are unmarshalled.
This patch removes some individual work-arounds of converting strings
to unicode, they only masked the problem. String values are not
passed to the validator or normalizers so things like adding the
realm automatically to services weren't happening.
ticket 941
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_ipalib/test_parameters.py | 2 | ||||
| -rw-r--r-- | tests/test_xmlrpc/test_user_plugin.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_ipalib/test_parameters.py b/tests/test_ipalib/test_parameters.py index e90a2625..ffdc864b 100644 --- a/tests/test_ipalib/test_parameters.py +++ b/tests/test_ipalib/test_parameters.py @@ -922,7 +922,7 @@ class test_Str(ClassChecker): mthd = o._convert_scalar for value in (u'Hello', 42, 1.2, unicode_str): assert mthd(value) == unicode(value) - bad = [True, dict(one=1)] + bad = [True, 'Hello', dict(one=1), utf8_bytes] for value in bad: e = raises(errors.ConversionError, mthd, value) assert e.name == 'my_str' diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index ad5d2142..d8d95b9f 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -510,8 +510,8 @@ class test_user(Declarative): desc='Create %r with a full address' % user1, command=( 'user_add', [user1], dict(givenname=u'Test', sn=u'User1', - street='123 Maple Rd', locality='Anytown', st='MD', - telephonenumber='410-555-1212',) + street=u'123 Maple Rd', locality=u'Anytown', st=u'MD', + telephonenumber=u'410-555-1212',) ), expected=dict( value=user1, |