summaryrefslogtreecommitdiffstats
path: root/test/functionalnosetests/swift_testing.py
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2013-10-24 22:04:40 -0400
committerLuis Pabon <lpabon@redhat.com>2013-10-25 10:57:40 -0700
commit04e402599b7b01c0a98df4724618555ab53cb775 (patch)
tree591827e1d367202105be2463c5858666ad6827a0 /test/functionalnosetests/swift_testing.py
parentb48149a4af9bc2c5de14a4f479bc7b11938bcf94 (diff)
Sync functional tests with Swift v1.9.1
Change-Id: Id478f651fe937883837291059da9da853fcd2de2 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/6141 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test/functionalnosetests/swift_testing.py')
-rw-r--r--test/functionalnosetests/swift_testing.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/test/functionalnosetests/swift_testing.py b/test/functionalnosetests/swift_testing.py
index ef4005e..c49d9cd 100644
--- a/test/functionalnosetests/swift_testing.py
+++ b/test/functionalnosetests/swift_testing.py
@@ -28,13 +28,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import errno
import os
import socket
import sys
from time import sleep
-from nose import SkipTest
-from ConfigParser import MissingSectionHeaderError
from test import get_config
@@ -168,10 +165,10 @@ def retry(func, *args, **kwargs):
if attempts > retries:
raise
parsed[use_account] = conn[use_account] = None
- except AuthError, err:
+ except AuthError:
url[use_account] = token[use_account] = None
continue
- except InternalServerError, err:
+ except InternalServerError:
pass
if attempts <= retries:
sleep(backoff)