test_stringutils.py: Fix test failure on CentOS builder, possibly Python 2.4.3-related.
authordavid-sarah <david-sarah@jacaranda.org>
Wed, 9 Jun 2010 06:50:56 +0000 (23:50 -0700)
committerdavid-sarah <david-sarah@jacaranda.org>
Wed, 9 Jun 2010 06:50:56 +0000 (23:50 -0700)
src/allmydata/test/test_stringutils.py

index 413eae8886119c6efb157420927c9c2c57041d42..df3af9585671b27f309d4522e232d4f4fc95dd62 100644 (file)
@@ -205,7 +205,7 @@ class StringUtils(ReallyEqualMixin):
 
         try:
             u"test".encode(self.filesystem_encoding)
-        except LookupError:
+        except (LookupError, AttributeError):
             raise unittest.SkipTest("This platform does not support the '%s' filesystem encoding "
                                     "that we are testing for the benefit of a different platform."
                                     % (self.filesystem_encoding,))
@@ -228,7 +228,7 @@ class StringUtils(ReallyEqualMixin):
 
         try:
             u"test".encode(self.filesystem_encoding)
-        except LookupError:
+        except (LookupError, AttributeError):
             raise unittest.SkipTest("This platform does not support the '%s' filesystem encoding "
                                     "that we are testing for the benefit of a different platform."
                                     % (self.filesystem_encoding,))