fix SkipTest imports in functests so they can be run directly by nose

Change-Id: I7ecc48f69ca677d5ecb0986ac4042688442355bb

test/functional/test_account.py

@@ -18,14 +18,13 @@
 import unittest2
 import json
 from uuid import uuid4
-from unittest2 import SkipTest
 from string import ascii_letters
 
 from six.moves import range
 from swift.common.middleware.acl import format_acl
 
 from test.functional import check_response, retry, requires_acls, \
-    load_constraint
+    load_constraint, SkipTest
 import test.functional as tf
 
 

test/functional/test_container.py

@@ -17,11 +17,10 @@
 
 import json
 import unittest2
-from unittest2 import SkipTest
 from uuid import uuid4
 
 from test.functional import check_response, cluster_info, retry, \
-    requires_acls, load_constraint, requires_policies
+    requires_acls, load_constraint, requires_policies, SkipTest
 import test.functional as tf
 
 from six.moves import range

test/functional/test_object.py

@@ -18,14 +18,13 @@
 import datetime
 import json
 import unittest2
-from unittest2 import SkipTest
 from uuid import uuid4
 import time
 
 from six.moves import range
 
 from test.functional import check_response, retry, requires_acls, \
-    requires_policies
+    requires_policies, SkipTest
 import test.functional as tf
 
 

test/functional/test_slo.py

@@ -19,10 +19,9 @@ import hashlib
 import itertools
 import json
 from copy import deepcopy
-from unittest2 import SkipTest
 
 import test.functional as tf
-from test.functional import cluster_info
+from test.functional import cluster_info, SkipTest
 from test.functional.tests import Utils, Base, Base2, BaseEnv
 from test.functional.swift_test_client import Connection, ResponseError
 

test/functional/test_symlink.py

@@ -22,11 +22,11 @@ import time
 
 from six.moves import urllib
 from uuid import uuid4
-from unittest2 import SkipTest
 
 from swift.common.utils import json, MD5_OF_EMPTY_STRING
 from swift.common.middleware.slo import SloGetContext
-from test.functional import check_response, retry, requires_acls, cluster_info
+from test.functional import check_response, retry, requires_acls, \
+    cluster_info, SkipTest
 from test.functional.tests import Base, TestFileComparisonEnv, Utils, BaseEnv
 from test.functional.test_slo import TestSloEnv
 from test.functional.test_dlo import TestDloEnv

test/functional/test_tempurl.py

@@ -19,14 +19,13 @@ import hashlib
 import json
 from copy import deepcopy
 from six.moves import urllib
-from unittest2 import SkipTest
 from time import time, strftime, gmtime
 
 import test.functional as tf
 from swift.common.middleware import tempurl
 from test.functional import cluster_info
 from test.functional.tests import Utils, Base, Base2, BaseEnv
-from test.functional import requires_acls
+from test.functional import requires_acls, SkipTest
 from test.functional.swift_test_client import Account, Connection, \
     ResponseError
 

test/functional/test_versioned_writes.py

@@ -17,14 +17,13 @@
 import json
 import time
 import unittest2
-from unittest2 import SkipTest
 
 import test.functional as tf
 from copy import deepcopy
 
 from swift.common.utils import MD5_OF_EMPTY_STRING
 from test.functional.tests import Base, Base2, BaseEnv, Utils
-from test.functional import cluster_info
+from test.functional import cluster_info, SkipTest
 from test.functional.swift_test_client import Account, Connection, \
     ResponseError
 

test/functional/tests.py

@@ -26,7 +26,6 @@ import unittest2
 import uuid
 from copy import deepcopy
 import eventlet
-from unittest2 import SkipTest
 from swift.common.http import is_success, is_client_error
 from email.utils import parsedate
 
@@ -36,7 +35,7 @@ from test.functional import normalized_urls, load_constraint, cluster_info
 from test.functional import check_response, retry
 import test.functional as tf
 from test.functional.swift_test_client import Account, Connection, File, \
-    ResponseError
+    ResponseError, SkipTest
 
 
 def setUpModule():