summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2010-01-10 17:47:15 -0700
committerRob Crittenden <rcritten@redhat.com>2010-01-22 14:41:49 -0500
commite9dc9de23afa987e59b1dcfc1a0e9c21b4c1f472 (patch)
tree3b5bdad3efcb45b94f394a97680bffc2f399f395 /tests
parentd6ca88f331a66799a18087b90af71f03b8706714 (diff)
downloadfreeipa-e9dc9de23afa987e59b1dcfc1a0e9c21b4c1f472.tar.gz
freeipa-e9dc9de23afa987e59b1dcfc1a0e9c21b4c1f472.tar.xz
freeipa-e9dc9de23afa987e59b1dcfc1a0e9c21b4c1f472.zip
Fixed xmlrpc_test.fuzzy_digits for Fedora12
Diffstat (limited to 'tests')
-rw-r--r--tests/test_xmlrpc/xmlrpc_test.py2
-rw-r--r--tests/util.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py
index 02b1f92c8..61fca50aa 100644
--- a/tests/test_xmlrpc/xmlrpc_test.py
+++ b/tests/test_xmlrpc/xmlrpc_test.py
@@ -32,7 +32,7 @@ from ipalib import errors
# Matches a gidnumber like '1391016742'
# FIXME: Does it make more sense to return gidnumber, uidnumber, etc. as `int`
# or `long`? If not, we still need to return them as `unicode` instead of `str`.
-fuzzy_digits = Fuzzy('^\d+$', type=str)
+fuzzy_digits = Fuzzy('^\d+$', type=basestring)
# Matches an ipauniqueid like u'784d85fd-eae7-11de-9d01-54520012478b'
fuzzy_uuid = Fuzzy(
diff --git a/tests/util.py b/tests/util.py
index ed8ecadf1..4d5fea670 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -210,7 +210,7 @@ class Fuzzy(object):
self.re = re.compile(regex)
if type is None:
type = unicode
- assert type in (unicode, str)
+ assert type in (unicode, str, basestring)
self.regex = regex
self.type = type
self.test = test