From a83a16ead5a103ceecfcaab70d2b4d7a421774a1 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 7 Dec 2012 13:44:02 -0500 Subject: [PATCH] Fix import order to comply with import ordering rules. Fixes pep8 failures TEMPEST N306 and N301. Change-Id: I87d6ef4058170da73ff64d4e4a4caf43f8a18046 --- tempest/common/rest_client.py | 2 +- tempest/common/ssh.py | 9 ++-- tempest/common/utils/data_utils.py | 2 +- tempest/common/utils/linux/remote_client.py | 13 +++--- tempest/manager.py | 22 +++++----- tempest/openstack.py | 44 +++++++++---------- tempest/services/boto/__init__.py | 11 +++-- tempest/services/boto/clients.py | 10 +++-- .../compute/json/console_output_client.py | 3 +- .../compute/json/extensions_client.py | 3 +- .../services/compute/json/flavors_client.py | 3 +- .../compute/json/floating_ips_client.py | 5 ++- tempest/services/compute/json/hosts_client.py | 3 +- .../services/compute/json/images_client.py | 5 ++- .../services/compute/json/keypairs_client.py | 3 +- .../compute/json/security_groups_client.py | 3 +- .../services/compute/json/servers_client.py | 5 ++- .../compute/json/volumes_extensions_client.py | 5 ++- .../compute/xml/floating_ips_client.py | 2 +- tempest/services/compute/xml/images_client.py | 2 +- tempest/services/compute/xml/limits_client.py | 3 +- .../services/compute/xml/servers_client.py | 9 ++-- .../compute/xml/volumes_extensions_client.py | 11 ++--- .../services/identity/json/admin_client.py | 5 ++- tempest/services/identity/xml/admin_client.py | 9 ++-- tempest/services/volume/xml/volumes_client.py | 6 +-- tempest/testboto.py | 26 ++++++----- tempest/tests/boto/__init__.py | 16 ++++--- tempest/tests/boto/test_ec2_instance_run.py | 26 ++++++----- tempest/tests/boto/test_ec2_keys.py | 4 +- tempest/tests/boto/test_ec2_network.py | 3 +- .../tests/boto/test_ec2_security_groups.py | 3 +- tempest/tests/boto/test_ec2_volumes.py | 11 ++--- tempest/tests/boto/test_s3_buckets.py | 3 +- tempest/tests/boto/test_s3_ec2_images.py | 16 ++++--- tempest/tests/boto/test_s3_objects.py | 8 ++-- tempest/tests/boto/utils/s3.py | 6 +-- tempest/tests/boto/utils/wait.py | 8 ++-- tempest/tests/compute/admin/test_flavors.py | 2 +- tempest/tests/compute/admin/test_quotas.py | 4 +- tempest/tests/compute/base.py | 4 +- .../floating_ips/test_floating_ips_actions.py | 4 +- .../floating_ips/test_list_floating_ips.py | 2 +- tempest/tests/compute/images/test_images.py | 7 +-- .../compute/images/test_list_image_filters.py | 3 +- .../tests/compute/images/test_list_images.py | 3 +- .../tests/compute/keypairs/test_keypairs.py | 2 +- .../test_security_group_rules.py | 2 +- .../security_groups/test_security_groups.py | 2 +- .../compute/servers/test_console_output.py | 2 +- .../compute/servers/test_create_server.py | 5 ++- .../tests/compute/servers/test_disk_config.py | 4 +- .../servers/test_list_server_filters.py | 7 +-- .../servers/test_list_servers_negative.py | 6 +-- .../compute/servers/test_server_actions.py | 6 +-- .../compute/servers/test_server_addresses.py | 2 +- .../servers/test_server_personality.py | 2 +- .../compute/servers/test_servers_negative.py | 4 +- .../compute/servers/test_servers_whitebox.py | 8 ++-- tempest/tests/compute/test_authorization.py | 9 ++-- .../compute/test_live_block_migration.py | 10 ++--- .../compute/volumes/test_attach_volume.py | 2 +- .../compute/volumes/test_volumes_negative.py | 2 +- tempest/tests/identity/admin/test_roles.py | 2 +- tempest/tests/identity/admin/test_services.py | 2 +- tempest/tests/identity/admin/test_tenants.py | 2 +- tempest/tests/identity/admin/test_users.py | 2 +- tempest/tests/network/base.py | 2 +- .../object_storage/test_container_services.py | 4 +- .../object_storage/test_object_services.py | 4 +- tempest/tests/volume/base.py | 6 +-- tempest/tests/volume/test_volumes_negative.py | 2 +- tempest/whitebox.py | 4 +- 73 files changed, 256 insertions(+), 206 deletions(-) diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py index f430f02459..b62045328f 100644 --- a/tempest/common/rest_client.py +++ b/tempest/common/rest_client.py @@ -15,8 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -import json import httplib2 +import json import logging from lxml import etree import time diff --git a/tempest/common/ssh.py b/tempest/common/ssh.py index c03a90cb55..1b40ddc8a7 100644 --- a/tempest/common/ssh.py +++ b/tempest/common/ssh.py @@ -15,12 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import time -import socket -import warnings -import select from cStringIO import StringIO +import select +import socket +import time +import warnings + from tempest import exceptions diff --git a/tempest/common/utils/data_utils.py b/tempest/common/utils/data_utils.py index 22e4742658..951fb61d93 100644 --- a/tempest/common/utils/data_utils.py +++ b/tempest/common/utils/data_utils.py @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. +import itertools import random import re import urllib -import itertools from tempest import exceptions diff --git a/tempest/common/utils/linux/remote_client.py b/tempest/common/utils/linux/remote_client.py index ca1557fd40..b501df4e69 100644 --- a/tempest/common/utils/linux/remote_client.py +++ b/tempest/common/utils/linux/remote_client.py @@ -1,10 +1,11 @@ -from tempest.common.ssh import Client -from tempest.config import TempestConfig -from tempest.common import utils -from tempest.exceptions import SSHTimeout, ServerUnreachable - -import time import re +import time + +from tempest.common.ssh import Client +from tempest.common import utils +from tempest.config import TempestConfig +from tempest.exceptions import ServerUnreachable +from tempest.exceptions import SSHTimeout class RemoteClient(): diff --git a/tempest/manager.py b/tempest/manager.py index 59743e5fd6..a17aa21e83 100644 --- a/tempest/manager.py +++ b/tempest/manager.py @@ -29,19 +29,19 @@ except ImportError: import tempest.config from tempest import exceptions # Tempest REST Fuzz testing client libs +from tempest.services.compute.json import console_output_client +from tempest.services.compute.json import extensions_client +from tempest.services.compute.json import flavors_client +from tempest.services.compute.json import floating_ips_client +from tempest.services.compute.json import images_client +from tempest.services.compute.json import keypairs_client +from tempest.services.compute.json import limits_client +from tempest.services.compute.json import quotas_client +from tempest.services.compute.json import security_groups_client +from tempest.services.compute.json import servers_client +from tempest.services.compute.json import volumes_extensions_client from tempest.services.network.json import network_client from tempest.services.volume.json import volumes_client -from tempest.services.compute.json import images_client -from tempest.services.compute.json import flavors_client -from tempest.services.compute.json import servers_client -from tempest.services.compute.json import limits_client -from tempest.services.compute.json import extensions_client -from tempest.services.compute.json import security_groups_client -from tempest.services.compute.json import floating_ips_client -from tempest.services.compute.json import keypairs_client -from tempest.services.compute.json import volumes_extensions_client -from tempest.services.compute.json import console_output_client -from tempest.services.compute.json import quotas_client NetworkClient = network_client.NetworkClient ImagesClient = images_client.ImagesClientJSON diff --git a/tempest/openstack.py b/tempest/openstack.py index fbd2f00584..e29ea8e5cf 100644 --- a/tempest/openstack.py +++ b/tempest/openstack.py @@ -19,47 +19,47 @@ import logging from tempest import config from tempest import exceptions -from tempest.services.identity.json.admin_client import AdminClientJSON -from tempest.services.identity.json.admin_client import TokenClientJSON -from tempest.services.identity.xml.admin_client import AdminClientXML -from tempest.services.identity.xml.admin_client import TokenClientXML -from tempest.services.image import service as image_service -from tempest.services.network.json.network_client import NetworkClient +from tempest.services.boto.clients import APIClientEC2 +from tempest.services.boto.clients import ObjectClientS3 from tempest.services.compute.json.extensions_client import \ -ExtensionsClientJSON + ExtensionsClientJSON from tempest.services.compute.json.flavors_client import FlavorsClientJSON from tempest.services.compute.json.floating_ips_client import \ -FloatingIPsClientJSON + FloatingIPsClientJSON from tempest.services.compute.json.images_client import ImagesClientJSON from tempest.services.compute.json.limits_client import LimitsClientJSON from tempest.services.compute.json.servers_client import ServersClientJSON -from tempest.services.compute.json.security_groups_client \ -import SecurityGroupsClientJSON +from tempest.services.compute.json.security_groups_client import \ + SecurityGroupsClientJSON from tempest.services.compute.json.keypairs_client import KeyPairsClientJSON -from tempest.services.compute.json.volumes_extensions_client \ -import VolumesExtensionsClientJSON -from tempest.services.compute.json.console_output_client \ -import ConsoleOutputsClient +from tempest.services.compute.json.quotas_client import QuotasClient +from tempest.services.compute.json.volumes_extensions_client import \ + VolumesExtensionsClientJSON +from tempest.services.compute.json.console_output_client import \ + ConsoleOutputsClient from tempest.services.compute.xml.extensions_client import ExtensionsClientXML from tempest.services.compute.xml.flavors_client import FlavorsClientXML from tempest.services.compute.xml.floating_ips_client import \ -FloatingIPsClientXML + FloatingIPsClientXML from tempest.services.compute.xml.images_client import ImagesClientXML from tempest.services.compute.xml.keypairs_client import KeyPairsClientXML from tempest.services.compute.xml.limits_client import LimitsClientXML from tempest.services.compute.xml.security_groups_client \ import SecurityGroupsClientXML from tempest.services.compute.xml.servers_client import ServersClientXML -from tempest.services.compute.xml.volumes_extensions_client \ -import VolumesExtensionsClientXML -from tempest.services.volume.json.volumes_client import VolumesClientJSON -from tempest.services.volume.xml.volumes_client import VolumesClientXML +from tempest.services.compute.xml.volumes_extensions_client import \ + VolumesExtensionsClientXML +from tempest.services.identity.json.admin_client import AdminClientJSON +from tempest.services.identity.json.admin_client import TokenClientJSON +from tempest.services.identity.xml.admin_client import AdminClientXML +from tempest.services.identity.xml.admin_client import TokenClientXML +from tempest.services.image import service as image_service +from tempest.services.network.json.network_client import NetworkClient from tempest.services.object_storage.account_client import AccountClient from tempest.services.object_storage.container_client import ContainerClient from tempest.services.object_storage.object_client import ObjectClient -from tempest.services.boto.clients import APIClientEC2 -from tempest.services.boto.clients import ObjectClientS3 -from tempest.services.compute.json.quotas_client import QuotasClient +from tempest.services.volume.json.volumes_client import VolumesClientJSON +from tempest.services.volume.xml.volumes_client import VolumesClientXML LOG = logging.getLogger(__name__) diff --git a/tempest/services/boto/__init__.py b/tempest/services/boto/__init__.py index 9b9fcebca6..2cac8439fd 100644 --- a/tempest/services/boto/__init__.py +++ b/tempest/services/boto/__init__.py @@ -15,17 +15,16 @@ # License for the specific language governing permissions and limitations # under the License. -import boto - from ConfigParser import DuplicateSectionError +from contextlib import closing +import re +from types import MethodType + +import boto from tempest.exceptions import InvalidConfiguration from tempest.exceptions import NotFound -import re -from types import MethodType -from contextlib import closing - class BotoClientBase(object): diff --git a/tempest/services/boto/clients.py b/tempest/services/boto/clients.py index 5fabcae2d7..9cfe2347db 100644 --- a/tempest/services/boto/clients.py +++ b/tempest/services/boto/clients.py @@ -15,12 +15,14 @@ # License for the specific language governing permissions and limitations # under the License. -import boto -from boto.s3.connection import OrdinaryCallingFormat -from boto.ec2.regioninfo import RegionInfo -from tempest.services.boto import BotoClientBase import urlparse +import boto +from boto.ec2.regioninfo import RegionInfo +from boto.s3.connection import OrdinaryCallingFormat + +from tempest.services.boto import BotoClientBase + class APIClientEC2(BotoClientBase): diff --git a/tempest/services/compute/json/console_output_client.py b/tempest/services/compute/json/console_output_client.py index d12fd7d932..0c3ba598e7 100644 --- a/tempest/services/compute/json/console_output_client.py +++ b/tempest/services/compute/json/console_output_client.py @@ -15,9 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient import json +from tempest.common.rest_client import RestClient + class ConsoleOutputsClient(RestClient): diff --git a/tempest/services/compute/json/extensions_client.py b/tempest/services/compute/json/extensions_client.py index c0200df309..583c3b4ff1 100644 --- a/tempest/services/compute/json/extensions_client.py +++ b/tempest/services/compute/json/extensions_client.py @@ -15,9 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient import json +from tempest.common.rest_client import RestClient + class ExtensionsClientJSON(RestClient): diff --git a/tempest/services/compute/json/flavors_client.py b/tempest/services/compute/json/flavors_client.py index dc825df7e7..1c8d4f3cc3 100644 --- a/tempest/services/compute/json/flavors_client.py +++ b/tempest/services/compute/json/flavors_client.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient import json import urllib +from tempest.common.rest_client import RestClient + class FlavorsClientJSON(RestClient): diff --git a/tempest/services/compute/json/floating_ips_client.py b/tempest/services/compute/json/floating_ips_client.py index 1303c52657..15882c72c1 100644 --- a/tempest/services/compute/json/floating_ips_client.py +++ b/tempest/services/compute/json/floating_ips_client.py @@ -15,11 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient -from tempest import exceptions import json import urllib +from tempest.common.rest_client import RestClient +from tempest import exceptions + class FloatingIPsClientJSON(RestClient): def __init__(self, config, username, password, auth_url, tenant_name=None): diff --git a/tempest/services/compute/json/hosts_client.py b/tempest/services/compute/json/hosts_client.py index a53d00d772..517e230918 100644 --- a/tempest/services/compute/json/hosts_client.py +++ b/tempest/services/compute/json/hosts_client.py @@ -1,6 +1,7 @@ -from tempest.common.rest_client import RestClient import json +from tempest.common.rest_client import RestClient + class HostsClientJSON(RestClient): diff --git a/tempest/services/compute/json/images_client.py b/tempest/services/compute/json/images_client.py index 999d6cb1fa..452400aa26 100644 --- a/tempest/services/compute/json/images_client.py +++ b/tempest/services/compute/json/images_client.py @@ -15,12 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient -from tempest import exceptions import json import time import urllib +from tempest.common.rest_client import RestClient +from tempest import exceptions + class ImagesClientJSON(RestClient): diff --git a/tempest/services/compute/json/keypairs_client.py b/tempest/services/compute/json/keypairs_client.py index 553936cd91..90b209631b 100644 --- a/tempest/services/compute/json/keypairs_client.py +++ b/tempest/services/compute/json/keypairs_client.py @@ -15,9 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient import json +from tempest.common.rest_client import RestClient + class KeyPairsClientJSON(RestClient): diff --git a/tempest/services/compute/json/security_groups_client.py b/tempest/services/compute/json/security_groups_client.py index cf8fed7e63..f2586e58d9 100644 --- a/tempest/services/compute/json/security_groups_client.py +++ b/tempest/services/compute/json/security_groups_client.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClient import json import urllib +from tempest.common.rest_client import RestClient + class SecurityGroupsClientJSON(RestClient): diff --git a/tempest/services/compute/json/servers_client.py b/tempest/services/compute/json/servers_client.py index 97ef78ed8d..2e34ef8b93 100644 --- a/tempest/services/compute/json/servers_client.py +++ b/tempest/services/compute/json/servers_client.py @@ -15,12 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest import exceptions -from tempest.common.rest_client import RestClient import json import time import urllib +from tempest.common.rest_client import RestClient +from tempest import exceptions + class ServersClientJSON(RestClient): diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py index 1c5d5253c8..6cf6c23419 100644 --- a/tempest/services/compute/json/volumes_extensions_client.py +++ b/tempest/services/compute/json/volumes_extensions_client.py @@ -15,12 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest import exceptions -from tempest.common.rest_client import RestClient import json import time import urllib +from tempest.common.rest_client import RestClient +from tempest import exceptions + class VolumesExtensionsClientJSON(RestClient): diff --git a/tempest/services/compute/xml/floating_ips_client.py b/tempest/services/compute/xml/floating_ips_client.py index fcb16d3fdf..a0059a8ffd 100644 --- a/tempest/services/compute/xml/floating_ips_client.py +++ b/tempest/services/compute/xml/floating_ips_client.py @@ -20,9 +20,9 @@ import urllib from tempest.common.rest_client import RestClientXML from tempest import exceptions -from tempest.services.compute.xml.common import xml_to_json from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element +from tempest.services.compute.xml.common import xml_to_json class FloatingIPsClientXML(RestClientXML): diff --git a/tempest/services/compute/xml/images_client.py b/tempest/services/compute/xml/images_client.py index b9cb220574..efed3fb899 100644 --- a/tempest/services/compute/xml/images_client.py +++ b/tempest/services/compute/xml/images_client.py @@ -20,8 +20,8 @@ import urllib from lxml import etree -from tempest import exceptions from tempest.common.rest_client import RestClientXML +from tempest import exceptions from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Text diff --git a/tempest/services/compute/xml/limits_client.py b/tempest/services/compute/xml/limits_client.py index 229dbee7c3..473952b45f 100644 --- a/tempest/services/compute/xml/limits_client.py +++ b/tempest/services/compute/xml/limits_client.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.rest_client import RestClientXML from lxml import etree from lxml import objectify +from tempest.common.rest_client import RestClientXML + NS = "{http://docs.openstack.org/common/api/v1.0}" diff --git a/tempest/services/compute/xml/servers_client.py b/tempest/services/compute/xml/servers_client.py index b354fb902e..b33335d676 100644 --- a/tempest/services/compute/xml/servers_client.py +++ b/tempest/services/compute/xml/servers_client.py @@ -16,16 +16,19 @@ # under the License. import logging +import time +import urllib + from lxml import etree -from tempest import exceptions + from tempest.common.rest_client import RestClientXML +from tempest import exceptions from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import xml_to_json from tempest.services.compute.xml.common import XMLNS_11 -import time -import urllib + LOG = logging.getLogger(__name__) diff --git a/tempest/services/compute/xml/volumes_extensions_client.py b/tempest/services/compute/xml/volumes_extensions_client.py index 871f2e50ad..1e8c738016 100644 --- a/tempest/services/compute/xml/volumes_extensions_client.py +++ b/tempest/services/compute/xml/volumes_extensions_client.py @@ -16,16 +16,17 @@ # under the License. import time -from lxml import etree import urllib -from tempest import exceptions +from lxml import etree + from tempest.common.rest_client import RestClientXML -from tempest.services.compute.xml.common import xml_to_json -from tempest.services.compute.xml.common import XMLNS_11 +from tempest import exceptions +from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Text -from tempest.services.compute.xml.common import Document +from tempest.services.compute.xml.common import xml_to_json +from tempest.services.compute.xml.common import XMLNS_11 class VolumesExtensionsClientXML(RestClientXML): diff --git a/tempest/services/identity/json/admin_client.py b/tempest/services/identity/json/admin_client.py index 9e171b643f..6c3619586b 100644 --- a/tempest/services/identity/json/admin_client.py +++ b/tempest/services/identity/json/admin_client.py @@ -1,8 +1,9 @@ -from tempest.common.rest_client import RestClient -from tempest import exceptions import httplib2 import json +from tempest.common.rest_client import RestClient +from tempest import exceptions + class AdminClientJSON(RestClient): diff --git a/tempest/services/identity/xml/admin_client.py b/tempest/services/identity/xml/admin_client.py index 0ace18408e..3a947b68e1 100644 --- a/tempest/services/identity/xml/admin_client.py +++ b/tempest/services/identity/xml/admin_client.py @@ -15,17 +15,20 @@ # License for the specific language governing permissions and limitations # under the License. +import httplib2 +import json import logging + from lxml import etree + from tempest.common.rest_client import RestClient from tempest.common.rest_client import RestClientXML +from tempest import exceptions from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Text from tempest.services.compute.xml.common import xml_to_json -from tempest import exceptions -import httplib2 -import json + XMLNS = "http://docs.openstack.org/identity/api/v2.0" diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py index b90c65a8ff..91d0fc7d4e 100644 --- a/tempest/services/volume/xml/volumes_client.py +++ b/tempest/services/volume/xml/volumes_client.py @@ -22,11 +22,11 @@ from lxml import etree from tempest.common.rest_client import RestClientXML from tempest import exceptions -from tempest.services.compute.xml.common import xml_to_json -from tempest.services.compute.xml.common import XMLNS_11 +from tempest.services.compute.xml.common import Document from tempest.services.compute.xml.common import Element from tempest.services.compute.xml.common import Text -from tempest.services.compute.xml.common import Document +from tempest.services.compute.xml.common import xml_to_json +from tempest.services.compute.xml.common import XMLNS_11 class VolumesClientXML(RestClientXML): diff --git a/tempest/testboto.py b/tempest/testboto.py index 6c5134679c..3a0eb2565e 100644 --- a/tempest/testboto.py +++ b/tempest/testboto.py @@ -15,21 +15,25 @@ # License for the specific language governing permissions and limitations # under the License. -import unittest2 as unittest -import nose -import tempest.tests.boto -from tempest.exceptions import TearDownException -from tempest.tests.boto.utils.wait import state_wait, wait_no_exception -from tempest.tests.boto.utils.wait import re_search_wait, wait_exception -import boto -from boto.s3.key import Key -from boto.s3.bucket import Bucket -from boto.exception import BotoServerError from contextlib import closing -import re import logging +import re import time +import boto +from boto.exception import BotoServerError +from boto.s3.bucket import Bucket +from boto.s3.key import Key +import nose +import unittest2 as unittest + +from tempest.exceptions import TearDownException +import tempest.tests.boto +from tempest.tests.boto.utils.wait import re_search_wait +from tempest.tests.boto.utils.wait import state_wait +from tempest.tests.boto.utils.wait import wait_exception +from tempest.tests.boto.utils.wait import wait_no_exception + LOG = logging.getLogger(__name__) diff --git a/tempest/tests/boto/__init__.py b/tempest/tests/boto/__init__.py index 11fa077ae3..fdcd3cd277 100644 --- a/tempest/tests/boto/__init__.py +++ b/tempest/tests/boto/__init__.py @@ -15,16 +15,18 @@ # License for the specific language governing permissions and limitations # under the License. -import tempest.config -from tempest.common.utils.file_utils import have_effective_read_access -import os -import tempest.openstack -import re -import keystoneclient.exceptions -import boto.exception import logging +import os +import re import urlparse +import boto.exception +import keystoneclient.exceptions + +from tempest.common.utils.file_utils import have_effective_read_access +import tempest.config +import tempest.openstack + A_I_IMAGES_READY = False # ari,ami,aki S3_CAN_CONNECT_ERROR = "Unknown Error" EC2_CAN_CONNECT_ERROR = "Unknown Error" diff --git a/tempest/tests/boto/test_ec2_instance_run.py b/tempest/tests/boto/test_ec2_instance_run.py index e5c61fb20c..023e3d0800 100644 --- a/tempest/tests/boto/test_ec2_instance_run.py +++ b/tempest/tests/boto/test_ec2_instance_run.py @@ -15,21 +15,23 @@ # License for the specific language governing permissions and limitations # under the License. -import nose -from nose.plugins.attrib import attr -import unittest2 as unittest -from tempest.testboto import BotoTestCase -from tempest.tests.boto.utils.s3 import s3_upload_dir -import tempest.tests.boto -from tempest.common.utils.data_utils import rand_name -from tempest.exceptions import EC2RegisterImageException -from tempest.tests.boto.utils.wait import state_wait, re_search_wait -from tempest import openstack -from tempest.common.utils.linux.remote_client import RemoteClient -from boto.s3.key import Key from contextlib import closing import logging +from boto.s3.key import Key +import nose +from nose.plugins.attrib import attr +import unittest2 as unittest + +from tempest.common.utils.data_utils import rand_name +from tempest.common.utils.linux.remote_client import RemoteClient +from tempest.exceptions import EC2RegisterImageException +from tempest import openstack +from tempest.testboto import BotoTestCase +import tempest.tests.boto +from tempest.tests.boto.utils.s3 import s3_upload_dir +from tempest.tests.boto.utils.wait import re_search_wait +from tempest.tests.boto.utils.wait import state_wait LOG = logging.getLogger(__name__) diff --git a/tempest/tests/boto/test_ec2_keys.py b/tempest/tests/boto/test_ec2_keys.py index 79d0b2bf88..b9e5508d51 100644 --- a/tempest/tests/boto/test_ec2_keys.py +++ b/tempest/tests/boto/test_ec2_keys.py @@ -15,12 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. - from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.testboto import BotoTestCase + from tempest.common.utils.data_utils import rand_name from tempest import openstack +from tempest.testboto import BotoTestCase def compare_key_pairs(a, b): diff --git a/tempest/tests/boto/test_ec2_network.py b/tempest/tests/boto/test_ec2_network.py index accf6779fa..c67b3aa850 100644 --- a/tempest/tests/boto/test_ec2_network.py +++ b/tempest/tests/boto/test_ec2_network.py @@ -17,8 +17,9 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.testboto import BotoTestCase + from tempest import openstack +from tempest.testboto import BotoTestCase @attr("EC2") diff --git a/tempest/tests/boto/test_ec2_security_groups.py b/tempest/tests/boto/test_ec2_security_groups.py index 3d50e8be24..72e8267474 100644 --- a/tempest/tests/boto/test_ec2_security_groups.py +++ b/tempest/tests/boto/test_ec2_security_groups.py @@ -17,9 +17,10 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.testboto import BotoTestCase + from tempest.common.utils.data_utils import rand_name from tempest import openstack +from tempest.testboto import BotoTestCase @attr("EC2") diff --git a/tempest/tests/boto/test_ec2_volumes.py b/tempest/tests/boto/test_ec2_volumes.py index 8b7e6be6eb..8d162060aa 100644 --- a/tempest/tests/boto/test_ec2_volumes.py +++ b/tempest/tests/boto/test_ec2_volumes.py @@ -15,14 +15,15 @@ # License for the specific language governing permissions and limitations # under the License. - -from nose.plugins.attrib import attr -from tempest.testboto import BotoTestCase -from tempest import openstack -import unittest2 as unittest import logging import time +from nose.plugins.attrib import attr +import unittest2 as unittest + +from tempest import openstack +from tempest.testboto import BotoTestCase + LOG = logging.getLogger(__name__) diff --git a/tempest/tests/boto/test_s3_buckets.py b/tempest/tests/boto/test_s3_buckets.py index 56cf52cb9b..ce4b21080a 100644 --- a/tempest/tests/boto/test_s3_buckets.py +++ b/tempest/tests/boto/test_s3_buckets.py @@ -17,9 +17,10 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.testboto import BotoTestCase + from tempest.common.utils.data_utils import rand_name from tempest import openstack +from tempest.testboto import BotoTestCase @attr("S3") diff --git a/tempest/tests/boto/test_s3_ec2_images.py b/tempest/tests/boto/test_s3_ec2_images.py index eeb7039763..4990be636d 100644 --- a/tempest/tests/boto/test_s3_ec2_images.py +++ b/tempest/tests/boto/test_s3_ec2_images.py @@ -15,19 +15,21 @@ # License for the specific language governing permissions and limitations # under the License. +from contextlib import closing +import logging +import os + +from boto.s3.key import Key +import nose from nose.plugins.attrib import attr import unittest2 as unittest + +from tempest.common.utils.data_utils import rand_name from tempest import openstack from tempest.testboto import BotoTestCase import tempest.tests.boto -from tempest.tests.boto.utils.wait import state_wait from tempest.tests.boto.utils.s3 import s3_upload_dir -from tempest.common.utils.data_utils import rand_name -from contextlib import closing -from boto.s3.key import Key -import logging -import nose -import os +from tempest.tests.boto.utils.wait import state_wait @attr("S3", "EC2") diff --git a/tempest/tests/boto/test_s3_objects.py b/tempest/tests/boto/test_s3_objects.py index c31ad6e372..cfb1ad50c0 100644 --- a/tempest/tests/boto/test_s3_objects.py +++ b/tempest/tests/boto/test_s3_objects.py @@ -15,14 +15,16 @@ # License for the specific language governing permissions and limitations # under the License. +from contextlib import closing + +from boto.s3.key import Key from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.testboto import BotoTestCase + from tempest.common.utils.data_utils import rand_name from tempest import openstack +from tempest.testboto import BotoTestCase from tempest.tests import boto -from boto.s3.key import Key -from contextlib import closing @attr("S3") diff --git a/tempest/tests/boto/utils/s3.py b/tempest/tests/boto/utils/s3.py index 70d9263213..4c3229b4e5 100644 --- a/tempest/tests/boto/utils/s3.py +++ b/tempest/tests/boto/utils/s3.py @@ -15,13 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import boto -from boto.s3.key import Key from contextlib import closing +import logging import os import re -import logging +import boto +from boto.s3.key import Key LOG = logging.getLogger(__name__) diff --git a/tempest/tests/boto/utils/wait.py b/tempest/tests/boto/utils/wait.py index 38b6ba1d46..951b5bf79e 100644 --- a/tempest/tests/boto/utils/wait.py +++ b/tempest/tests/boto/utils/wait.py @@ -15,12 +15,14 @@ # License for the specific language governing permissions and limitations # under the License. -import tempest.config -import time -from unittest2 import TestCase import logging import re +import time + from boto.exception import BotoServerError +from unittest2 import TestCase + +import tempest.config LOG = logging.getLogger(__name__) diff --git a/tempest/tests/compute/admin/test_flavors.py b/tempest/tests/compute/admin/test_flavors.py index dc9248dad8..e5de0cbca6 100644 --- a/tempest/tests/compute/admin/test_flavors.py +++ b/tempest/tests/compute/admin/test_flavors.py @@ -19,8 +19,8 @@ import nose from nose.plugins.attrib import attr import unittest2 as unittest -from tempest.tests.compute import base from tempest.tests import compute +from tempest.tests.compute import base class FlavorsAdminTestBase(object): diff --git a/tempest/tests/compute/admin/test_quotas.py b/tempest/tests/compute/admin/test_quotas.py index 98ca169c00..75684a066f 100644 --- a/tempest/tests/compute/admin/test_quotas.py +++ b/tempest/tests/compute/admin/test_quotas.py @@ -17,9 +17,9 @@ from nose.plugins.attrib import attr -from tempest.tests.compute.base import BaseComputeTest -from tempest.services.compute.admin.json import quotas_client as adm_quotas from tempest import exceptions +from tempest.services.compute.admin.json import quotas_client as adm_quotas +from tempest.tests.compute.base import BaseComputeTest class QuotasTest(BaseComputeTest): diff --git a/tempest/tests/compute/base.py b/tempest/tests/compute/base.py index bb2ff8b02f..eb8b443fc8 100644 --- a/tempest/tests/compute/base.py +++ b/tempest/tests/compute/base.py @@ -18,13 +18,13 @@ import logging import time -import unittest2 as unittest import nose +import unittest2 as unittest +from tempest.common.utils.data_utils import rand_name from tempest import config from tempest import exceptions from tempest import openstack -from tempest.common.utils.data_utils import rand_name __all__ = ['BaseComputeTest', 'BaseComputeTestJSON', 'BaseComputeTestXML', 'BaseComputeAdminTestJSON', 'BaseComputeAdminTestXML'] diff --git a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py index 7d30eeb0c6..c988e061f8 100644 --- a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py @@ -18,9 +18,9 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import openstack -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions +from tempest import openstack from tempest.tests.compute import base diff --git a/tempest/tests/compute/floating_ips/test_list_floating_ips.py b/tempest/tests/compute/floating_ips/test_list_floating_ips.py index 34d7369d36..6f74f74bef 100644 --- a/tempest/tests/compute/floating_ips/test_list_floating_ips.py +++ b/tempest/tests/compute/floating_ips/test_list_floating_ips.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base diff --git a/tempest/tests/compute/images/test_images.py b/tempest/tests/compute/images/test_images.py index 5937811503..b048c58e6a 100644 --- a/tempest/tests/compute/images/test_images.py +++ b/tempest/tests/compute/images/test_images.py @@ -15,16 +15,17 @@ # License for the specific language governing permissions and limitations # under the License. +import nose from nose.plugins.attrib import attr import unittest2 as unittest -import nose -from tempest.common.utils.data_utils import rand_name, parse_image_id +from tempest.common.utils.data_utils import parse_image_id +from tempest.common.utils.data_utils import rand_name import tempest.config from tempest import exceptions from tempest import openstack -from tempest.tests.compute import base from tempest.tests import compute +from tempest.tests.compute import base class ImagesTestBase(object): diff --git a/tempest/tests/compute/images/test_list_image_filters.py b/tempest/tests/compute/images/test_list_image_filters.py index b6be358439..c27d381a2b 100644 --- a/tempest/tests/compute/images/test_list_image_filters.py +++ b/tempest/tests/compute/images/test_list_image_filters.py @@ -17,8 +17,9 @@ from nose.plugins.attrib import attr +from tempest.common.utils.data_utils import parse_image_id +from tempest.common.utils.data_utils import rand_name from tempest import exceptions -from tempest.common.utils.data_utils import rand_name, parse_image_id from tempest.tests.compute.base import BaseComputeTest diff --git a/tempest/tests/compute/images/test_list_images.py b/tempest/tests/compute/images/test_list_images.py index ca8ec18b5f..838c3a3010 100644 --- a/tempest/tests/compute/images/test_list_images.py +++ b/tempest/tests/compute/images/test_list_images.py @@ -17,8 +17,9 @@ from nose.plugins.attrib import attr +from tempest.common.utils.data_utils import parse_image_id +from tempest.common.utils.data_utils import rand_name from tempest import exceptions -from tempest.common.utils.data_utils import rand_name, parse_image_id from tempest.tests.compute.base import BaseComputeTest diff --git a/tempest/tests/compute/keypairs/test_keypairs.py b/tempest/tests/compute/keypairs/test_keypairs.py index 9d297f63c6..43ad07608a 100644 --- a/tempest/tests/compute/keypairs/test_keypairs.py +++ b/tempest/tests/compute/keypairs/test_keypairs.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute.base import BaseComputeTestJSON from tempest.tests.compute.base import BaseComputeTestXML diff --git a/tempest/tests/compute/security_groups/test_security_group_rules.py b/tempest/tests/compute/security_groups/test_security_group_rules.py index ea23cf5071..ab5af92123 100644 --- a/tempest/tests/compute/security_groups/test_security_group_rules.py +++ b/tempest/tests/compute/security_groups/test_security_group_rules.py @@ -17,8 +17,8 @@ from nose.plugins.attrib import attr -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base diff --git a/tempest/tests/compute/security_groups/test_security_groups.py b/tempest/tests/compute/security_groups/test_security_groups.py index 81e84cecb2..1c0cc945ed 100644 --- a/tempest/tests/compute/security_groups/test_security_groups.py +++ b/tempest/tests/compute/security_groups/test_security_groups.py @@ -17,8 +17,8 @@ from nose.plugins.attrib import attr -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base diff --git a/tempest/tests/compute/servers/test_console_output.py b/tempest/tests/compute/servers/test_console_output.py index b08dcc2f32..e88aac9fca 100644 --- a/tempest/tests/compute/servers/test_console_output.py +++ b/tempest/tests/compute/servers/test_console_output.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute.base import BaseComputeTest diff --git a/tempest/tests/compute/servers/test_create_server.py b/tempest/tests/compute/servers/test_create_server.py index 461f5e4f1a..8964fc2017 100644 --- a/tempest/tests/compute/servers/test_create_server.py +++ b/tempest/tests/compute/servers/test_create_server.py @@ -20,11 +20,12 @@ import base64 from nose.plugins.attrib import attr import unittest2 as unittest -import tempest.config + from tempest.common.utils.data_utils import rand_name from tempest.common.utils.linux.remote_client import RemoteClient -from tempest.tests.compute import base +import tempest.config from tempest.tests import compute +from tempest.tests.compute import base class ServersTest(object): diff --git a/tempest/tests/compute/servers/test_disk_config.py b/tempest/tests/compute/servers/test_disk_config.py index 1273fe4e0c..638e093969 100644 --- a/tempest/tests/compute/servers/test_disk_config.py +++ b/tempest/tests/compute/servers/test_disk_config.py @@ -19,10 +19,10 @@ import nose from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name -from tempest.tests.compute.base import BaseComputeTest +from tempest import exceptions from tempest.tests import compute +from tempest.tests.compute.base import BaseComputeTest class TestServerDiskConfig(BaseComputeTest): diff --git a/tempest/tests/compute/servers/test_list_server_filters.py b/tempest/tests/compute/servers/test_list_server_filters.py index 5e4b267bff..3aeb8e8514 100644 --- a/tempest/tests/compute/servers/test_list_server_filters.py +++ b/tempest/tests/compute/servers/test_list_server_filters.py @@ -15,15 +15,16 @@ # License for the specific language governing permissions and limitations # under the License. -import nose.plugins.skip + +import nose from nose.plugins.attrib import attr +import nose.plugins.skip import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base from tempest.tests import utils -import nose class ListServerFiltersTest(object): diff --git a/tempest/tests/compute/servers/test_list_servers_negative.py b/tempest/tests/compute/servers/test_list_servers_negative.py index b2d053db1b..f891c499d3 100644 --- a/tempest/tests/compute/servers/test_list_servers_negative.py +++ b/tempest/tests/compute/servers/test_list_servers_negative.py @@ -18,14 +18,14 @@ import re import sys -import unittest2 as unittest import nose +import unittest2 as unittest +from tempest.common.utils.data_utils import rand_name from tempest import exceptions from tempest import openstack -from tempest.common.utils.data_utils import rand_name -from tempest.tests.compute.base import BaseComputeTest from tempest.tests import compute +from tempest.tests.compute.base import BaseComputeTest class ListServersNegativeTest(BaseComputeTest): diff --git a/tempest/tests/compute/servers/test_server_actions.py b/tempest/tests/compute/servers/test_server_actions.py index dd6b02f241..835afb06ab 100644 --- a/tempest/tests/compute/servers/test_server_actions.py +++ b/tempest/tests/compute/servers/test_server_actions.py @@ -21,12 +21,12 @@ import time from nose.plugins.attrib import attr import unittest2 as unittest -import tempest.config -from tempest import exceptions from tempest.common.utils.data_utils import rand_name from tempest.common.utils.linux.remote_client import RemoteClient -from tempest.tests.compute import base +import tempest.config +from tempest import exceptions from tempest.tests import compute +from tempest.tests.compute import base class ServerActionsTestBase(object): diff --git a/tempest/tests/compute/servers/test_server_addresses.py b/tempest/tests/compute/servers/test_server_addresses.py index 164548dd31..745a9d81c8 100644 --- a/tempest/tests/compute/servers/test_server_addresses.py +++ b/tempest/tests/compute/servers/test_server_addresses.py @@ -17,8 +17,8 @@ from nose.plugins.attrib import attr -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute.base import BaseComputeTest diff --git a/tempest/tests/compute/servers/test_server_personality.py b/tempest/tests/compute/servers/test_server_personality.py index 75457d1d1c..3003a5218d 100644 --- a/tempest/tests/compute/servers/test_server_personality.py +++ b/tempest/tests/compute/servers/test_server_personality.py @@ -19,8 +19,8 @@ import base64 from nose.plugins.attrib import attr -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base diff --git a/tempest/tests/compute/servers/test_servers_negative.py b/tempest/tests/compute/servers/test_servers_negative.py index fb88d1e14a..60f3daf91b 100644 --- a/tempest/tests/compute/servers/test_servers_negative.py +++ b/tempest/tests/compute/servers/test_servers_negative.py @@ -17,13 +17,13 @@ import sys +import nose from nose.plugins.attrib import attr import unittest2 as unittest -import nose +from tempest.common.utils.data_utils import rand_name from tempest import exceptions from tempest import openstack -from tempest.common.utils.data_utils import rand_name from tempest.tests.compute.base import BaseComputeTest diff --git a/tempest/tests/compute/servers/test_servers_whitebox.py b/tempest/tests/compute/servers/test_servers_whitebox.py index 980f6cf8aa..b3665dd473 100644 --- a/tempest/tests/compute/servers/test_servers_whitebox.py +++ b/tempest/tests/compute/servers/test_servers_whitebox.py @@ -15,12 +15,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest import exceptions -from tempest import whitebox -from tempest.tests.identity.base import BaseIdentityAdminTest +import nose from nose.plugins.attrib import attr -import nose +from tempest import exceptions +from tempest.tests.identity.base import BaseIdentityAdminTest +from tempest import whitebox @attr(type='whitebox') diff --git a/tempest/tests/compute/test_authorization.py b/tempest/tests/compute/test_authorization.py index 0d08c18452..beff07ffb4 100644 --- a/tempest/tests/compute/test_authorization.py +++ b/tempest/tests/compute/test_authorization.py @@ -16,15 +16,16 @@ # under the License. from nose.plugins.attrib import attr -from nose.tools import raises from nose import SkipTest +from nose.tools import raises import unittest2 as unittest -from tempest import openstack -from tempest.common.utils.data_utils import rand_name, parse_image_id +from tempest.common.utils.data_utils import parse_image_id +from tempest.common.utils.data_utils import rand_name from tempest import exceptions -from tempest.tests.compute.base import BaseComputeTest +from tempest import openstack from tempest.tests import compute +from tempest.tests.compute.base import BaseComputeTest class AuthorizationTest(BaseComputeTest): diff --git a/tempest/tests/compute/test_live_block_migration.py b/tempest/tests/compute/test_live_block_migration.py index 92c2cf6af7..48d374f5f5 100644 --- a/tempest/tests/compute/test_live_block_migration.py +++ b/tempest/tests/compute/test_live_block_migration.py @@ -15,19 +15,19 @@ # License for the specific language governing permissions and limitations # under the License. -import nose -import unittest2 as unittest -from nose.plugins.attrib import attr import random import string -from tempest.tests.compute import base +import nose +from nose.plugins.attrib import attr +import unittest2 as unittest + from tempest.common.utils.linux.remote_client import RemoteClient from tempest import config from tempest import exceptions - from tempest.services.compute.json.hosts_client import HostsClientJSON from tempest.services.compute.json.servers_client import ServersClientJSON +from tempest.tests.compute import base @attr(category='live-migration') diff --git a/tempest/tests/compute/volumes/test_attach_volume.py b/tempest/tests/compute/volumes/test_attach_volume.py index cb695c1594..b95a9fd6e9 100644 --- a/tempest/tests/compute/volumes/test_attach_volume.py +++ b/tempest/tests/compute/volumes/test_attach_volume.py @@ -18,9 +18,9 @@ from nose.plugins.attrib import attr import unittest2 as unittest -import tempest.config from tempest.common.utils.data_utils import rand_name from tempest.common.utils.linux.remote_client import RemoteClient +import tempest.config from tempest import openstack from tempest.tests.compute import base diff --git a/tempest/tests/compute/volumes/test_volumes_negative.py b/tempest/tests/compute/volumes/test_volumes_negative.py index fa14640778..6994ab1cf0 100644 --- a/tempest/tests/compute/volumes/test_volumes_negative.py +++ b/tempest/tests/compute/volumes/test_volumes_negative.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr from nose.tools import raises -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.compute import base diff --git a/tempest/tests/identity/admin/test_roles.py b/tempest/tests/identity/admin/test_roles.py index 637cee5ce2..0e1da7dbd7 100644 --- a/tempest/tests/identity/admin/test_roles.py +++ b/tempest/tests/identity/admin/test_roles.py @@ -17,8 +17,8 @@ import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.identity import base diff --git a/tempest/tests/identity/admin/test_services.py b/tempest/tests/identity/admin/test_services.py index da697ab5c0..6baa7c266c 100644 --- a/tempest/tests/identity/admin/test_services.py +++ b/tempest/tests/identity/admin/test_services.py @@ -17,8 +17,8 @@ import nose -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.identity import base diff --git a/tempest/tests/identity/admin/test_tenants.py b/tempest/tests/identity/admin/test_tenants.py index 1b4ec18a30..226aae6355 100644 --- a/tempest/tests/identity/admin/test_tenants.py +++ b/tempest/tests/identity/admin/test_tenants.py @@ -17,8 +17,8 @@ import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.identity import base diff --git a/tempest/tests/identity/admin/test_users.py b/tempest/tests/identity/admin/test_users.py index a724ce90d3..e2938bdb7f 100644 --- a/tempest/tests/identity/admin/test_users.py +++ b/tempest/tests/identity/admin/test_users.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr import unittest2 as unittest -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.identity import base diff --git a/tempest/tests/network/base.py b/tempest/tests/network/base.py index 887056e1b5..78a69f8682 100644 --- a/tempest/tests/network/base.py +++ b/tempest/tests/network/base.py @@ -18,9 +18,9 @@ import nose import unittest2 as unittest +from tempest.common.utils.data_utils import rand_name from tempest import exceptions from tempest import openstack -from tempest.common.utils.data_utils import rand_name class BaseNetworkTest(unittest.TestCase): diff --git a/tempest/tests/object_storage/test_container_services.py b/tempest/tests/object_storage/test_container_services.py index e57256b94a..b99859e637 100644 --- a/tempest/tests/object_storage/test_container_services.py +++ b/tempest/tests/object_storage/test_container_services.py @@ -16,7 +16,9 @@ # under the License. from nose.plugins.attrib import attr -from tempest.common.utils.data_utils import rand_name, arbitrary_string + +from tempest.common.utils.data_utils import arbitrary_string +from tempest.common.utils.data_utils import rand_name from tempest.tests.object_storage import base diff --git a/tempest/tests/object_storage/test_object_services.py b/tempest/tests/object_storage/test_object_services.py index 97b7e0d747..3be2beedb6 100644 --- a/tempest/tests/object_storage/test_object_services.py +++ b/tempest/tests/object_storage/test_object_services.py @@ -16,7 +16,9 @@ # under the License. from nose.plugins.attrib import attr -from tempest.common.utils.data_utils import rand_name, arbitrary_string + +from tempest.common.utils.data_utils import arbitrary_string +from tempest.common.utils.data_utils import rand_name from tempest.tests.object_storage import base diff --git a/tempest/tests/volume/base.py b/tempest/tests/volume/base.py index 6af4bbfab9..f28be7de01 100644 --- a/tempest/tests/volume/base.py +++ b/tempest/tests/volume/base.py @@ -17,14 +17,14 @@ import logging import time -import nose +import nose import unittest2 as unittest -from tempest import config -from tempest import openstack from tempest.common.utils.data_utils import rand_name +from tempest import config from tempest import exceptions +from tempest import openstack LOG = logging.getLogger(__name__) diff --git a/tempest/tests/volume/test_volumes_negative.py b/tempest/tests/volume/test_volumes_negative.py index bf7e5f06f3..2c8b006eb2 100644 --- a/tempest/tests/volume/test_volumes_negative.py +++ b/tempest/tests/volume/test_volumes_negative.py @@ -18,8 +18,8 @@ from nose.plugins.attrib import attr from nose.tools import raises -from tempest import exceptions from tempest.common.utils.data_utils import rand_name +from tempest import exceptions from tempest.tests.volume import base diff --git a/tempest/whitebox.py b/tempest/whitebox.py index 2711903393..39cd666cae 100644 --- a/tempest/whitebox.py +++ b/tempest/whitebox.py @@ -17,15 +17,15 @@ import logging import os -import sys import shlex import subprocess +import sys import nose from sqlalchemy import create_engine, MetaData -from tempest.common.utils.data_utils import rand_name from tempest.common.ssh import Client +from tempest.common.utils.data_utils import rand_name from tempest import exceptions from tempest import test from tempest.tests import compute