From: david-sarah <david-sarah@jacaranda.org>
Date: Wed, 9 Jun 2010 06:50:56 +0000 (-0700)
Subject: test_stringutils.py: Fix test failure on CentOS builder, possibly Python 2.4.3-related.
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=5786874d38edc6534b1c729118aa270c6fbf1f3e;p=tahoe-lafs%2Ftahoe-lafs.git

test_stringutils.py: Fix test failure on CentOS builder, possibly Python 2.4.3-related.
---

diff --git a/src/allmydata/test/test_stringutils.py b/src/allmydata/test/test_stringutils.py
index 413eae88..df3af958 100644
--- a/src/allmydata/test/test_stringutils.py
+++ b/src/allmydata/test/test_stringutils.py
@@ -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,))