From 6a8e9a70e9489a8f17405adf64462899d6a4ca81 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Fri, 10 Jan 2014 19:44:39 -0500 Subject: Sync with OpenStack v1.11.0 Jan 10 2014 Updated tox.ini, functional tests, and proxy unit tests. BUG: https://bugs.launchpad.net/bugs/1268017 Change-Id: I5ff8359b8abdb8fe5ae82492c12f57c395992735 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/6682 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- test/unit/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/unit/__init__.py') diff --git a/test/unit/__init__.py b/test/unit/__init__.py index fa46715..847479a 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -17,9 +17,9 @@ import os import copy -import errno import logging -from sys import exc_info +import errno +import sys from contextlib import contextmanager from collections import defaultdict from tempfile import NamedTemporaryFile @@ -28,7 +28,7 @@ from eventlet.green import socket from tempfile import mkdtemp from shutil import rmtree from test import get_config -from swift.common.utils import config_true_value +from swift.common.utils import config_true_value, LogAdapter from hashlib import md5 from eventlet import sleep, Timeout import logging.handlers -- cgit