From e63c462f31bc34c5b19d243492c7644f423d55d0 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Wed, 24 Sep 2008 06:48:27 +0000 Subject: 335: If Command.__convert_scalar() is called with None, it now returns None instead of raising TypeError --- ipalib/tests/test_frontend.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ipalib/tests') diff --git a/ipalib/tests/test_frontend.py b/ipalib/tests/test_frontend.py index d809d1cf..e6127797 100644 --- a/ipalib/tests/test_frontend.py +++ b/ipalib/tests/test_frontend.py @@ -148,8 +148,7 @@ class test_Param(ClassChecker): # Scenario 1: multivalue=False o = self.cls(name, type_) - e = raises(TypeError, o.convert, None) - assert str(e) == 'value cannot be None' + assert o.convert(None) is None for value in okay: new = o.convert(value) assert new == 7 @@ -163,10 +162,8 @@ class test_Param(ClassChecker): # Scenario 2: multivalue=True o = self.cls(name, type_, multivalue=True) - assert o.convert([]) is None - for none in [None, (7, None)]: - e = raises(TypeError, o.convert, none) - assert str(e) == 'value cannot be None' + for none in (None, tuple(), []): + assert o.convert(none) is None for value in okay: assert o.convert((value,)) == (7,) assert o.convert([value]) == (7,) -- cgit