diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-08 12:34:38 -0700 |
---|---|---|
committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-12-08 12:34:38 -0700 |
commit | 8a2902a2a240108e16561679e01f52b362097b3a (patch) | |
tree | b3768555d518e0683c04803c6b4305de82d0743d /tests | |
parent | 5a2b0cd6b8151a18fa5fd0e4f7eacf9e2c9dde8f (diff) | |
download | freeipa-8a2902a2a240108e16561679e01f52b362097b3a.tar.gz freeipa-8a2902a2a240108e16561679e01f52b362097b3a.tar.xz freeipa-8a2902a2a240108e16561679e01f52b362097b3a.zip |
Re-enable Python2.4 tests and fixed some small things broken under Python2.4
Diffstat (limited to 'tests')
-rw-r--r-- | tests/data.py | 1 | ||||
-rw-r--r-- | tests/test_ipalib/test_rpc.py | 3 | ||||
-rw-r--r-- | tests/test_ipalib/test_util.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/data.py b/tests/data.py index 92df4aa3a..cf646ea9d 100644 --- a/tests/data.py +++ b/tests/data.py @@ -36,4 +36,3 @@ utf8_bytes = '\xd0\x9f\xd0\xb0\xd0\xb2\xd0\xb5\xd0\xbb' unicode_str = u'\u041f\u0430\u0432\u0435\u043b' assert utf8_bytes.decode('UTF-8') == unicode_str assert unicode_str.encode('UTF-8') == utf8_bytes -assert utf8_bytes != unicode_str diff --git a/tests/test_ipalib/test_rpc.py b/tests/test_ipalib/test_rpc.py index e8d73931c..7af8c220c 100644 --- a/tests/test_ipalib/test_rpc.py +++ b/tests/test_ipalib/test_rpc.py @@ -26,6 +26,7 @@ import struct from tests.util import raises from ipalib import rpc +# FIXME: These constants should be imported from tests.data # A string that should have bytes 'x\00' through '\xff': BINARY_BYTES = ''.join(struct.pack('B', d) for d in xrange(256)) @@ -39,7 +40,7 @@ UTF8_BYTES = '\xd0\x9f\xd0\xb0\xd0\xb2\xd0\xb5\xd0\xbb' UNICODE_CHARS = u'\u041f\u0430\u0432\u0435\u043b' assert UTF8_BYTES.decode('UTF-8') == UNICODE_CHARS assert UNICODE_CHARS.encode('UTF-8') == UTF8_BYTES -assert UTF8_BYTES != UNICODE_CHARS + def dump_n_load(value): diff --git a/tests/test_ipalib/test_util.py b/tests/test_ipalib/test_util.py index 8069d89b8..ef5627357 100644 --- a/tests/test_ipalib/test_util.py +++ b/tests/test_ipalib/test_util.py @@ -21,6 +21,8 @@ Test the `ipalib.util` module. """ +# FIXME: Most of these tests are depreciated and have moved to test_rpc.py + from xmlrpclib import Binary, dumps, loads import struct from tests.util import raises @@ -39,7 +41,6 @@ UTF8_BYTES = '\xd0\x9f\xd0\xb0\xd0\xb2\xd0\xb5\xd0\xbb' UNICODE_CHARS = u'\u041f\u0430\u0432\u0435\u043b' assert UTF8_BYTES.decode('UTF-8') == UNICODE_CHARS assert UNICODE_CHARS.encode('UTF-8') == UTF8_BYTES -assert UTF8_BYTES != UNICODE_CHARS def dump_n_load(value): |