summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-01-24 10:43:59 -0500
committerRob Crittenden <rcritten@redhat.com>2011-01-24 14:34:38 -0500
commit96469fbc886bb53a898396ad030a48609f147160 (patch)
tree028670e416aa7671e242e01b6fcfdef72b525be6 /tests
parent6e7729726f6e87dc117d284719d3f68833056a28 (diff)
downloadfreeipa-96469fbc886bb53a898396ad030a48609f147160.tar.gz
freeipa-96469fbc886bb53a898396ad030a48609f147160.tar.xz
freeipa-96469fbc886bb53a898396ad030a48609f147160.zip
Fix failed tests. API for utcoffset changed and strings are more robust.
In Python 2.7 the API for time.utcoffset() changed. We do more automatic conversions of strings so need to loosen the tests a bit.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_ipalib/test_parameters.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_ipalib/test_parameters.py b/tests/test_ipalib/test_parameters.py
index fd9880db..e90a2625 100644
--- a/tests/test_ipalib/test_parameters.py
+++ b/tests/test_ipalib/test_parameters.py
@@ -33,6 +33,7 @@ from ipalib import parameters, request, errors, config
from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, NULLS
from ipalib.errors import ValidationError
from ipalib import _
+from xmlrpclib import MAXINT
class test_DefaultFrom(ClassChecker):
"""
@@ -921,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, 'Hello', dict(one=1), utf8_bytes]
+ bad = [True, dict(one=1)]
for value in bad:
e = raises(errors.ConversionError, mthd, value)
assert e.name == 'my_str'
@@ -1164,7 +1165,7 @@ class test_Int(ClassChecker):
assert o.type is int
assert isinstance(o, parameters.Int)
assert o.minvalue is None
- assert o.maxvalue is None
+ assert o.maxvalue == int(MAXINT)
# Test when min > max:
e = raises(ValueError, self.cls, 'my_number', minvalue=22, maxvalue=15)
@@ -1233,7 +1234,7 @@ class test_Int(ClassChecker):
"""
o = self.cls('my_number')
# Assure invalid inputs raise error
- for bad in ['hello', u'hello', True, None, '10', u'', u'.']:
+ for bad in ['hello', u'hello', True, None, u'', u'.']:
e = raises(errors.ConversionError, o._convert_scalar, bad)
assert e.name == 'my_number'
assert e.index is None