Rebase to OpenStack Swift Havana (1.10.0)

Change-Id: I90821230a1a7100c74d97cccc9c445251d0f65e7
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/6157
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 33 insertions, 3 deletions

diff --git a/test/__init__.py b/test/__init__.py
index 9095348..7eb5f47 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,13 +1,43 @@
+# Copyright (c) 2010-2012 OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # See http://code.google.com/p/python-nose/issues/detail?id=373
 # The code below enables nosetests to work with i18n _() blocks
 
-import __builtin__
 import sys
 import os
+try:
+    from unittest.util import safe_repr
+except ImportError:
+    # Probably py26
+    _MAX_LENGTH = 80
 
-from swift.common.utils import readconf
+    def safe_repr(obj, short=False):
+        try:
+            result = repr(obj)
+        except Exception:
+            result = object.__repr__(obj)
+        if not short or len(result) < _MAX_LENGTH:
+            return result
+        return result[:_MAX_LENGTH] + ' [truncated]...'
 
-setattr(__builtin__, '_', lambda x: x)
+# make unittests pass on all locale
+import swift
+setattr(swift, 'gettext_', lambda x: x)
+
+from swift.common.utils import readconf
 
 
 # Work around what seems to be a Python bug.