x/cloudcafe
Code Issues Proposed changes

Replaced all imports of unittest2 with unitest imports

Browse Source 
Change-Id: Id5796f5e1953dc9a0073f0e76a23ccce83c2bbd7
This commit is contained in:
Jose Idar
2015-03-30 10:47:33 -05:00
parent 09a514c997
commit fc0480e007
28 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
metatests/cloudcafe/compute/common/models/test_metadata.py
View File

@@ -15,7 +15,7 @@ limitations under the License.
"""
import json
import unittest2 as unittest
import unittest
from cloudcafe.compute.common.models.metadata import Metadata, MetadataItem

2
metatests/cloudcafe/compute/extensions/console_output/models/test_console_output.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.console_output_api.models.console_output\
import VncConsoleOutput

2
metatests/cloudcafe/compute/extensions/console_output/models/test_console_output_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.console_output_api.models.requests\
import GetConsoleOutput

2
metatests/cloudcafe/compute/extensions/rescue/models/test_rescue.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.rescue_api.models.responses \
import RescueResponse

2
metatests/cloudcafe/compute/extensions/vnc_console/models/test_console.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.vnc_console_api.models.vnc_console\
import VncConsole

2
metatests/cloudcafe/compute/extensions/vnc_console/models/test_console_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.vnc_console_api.models.requests\
import GetVncConsole

2
metatests/cloudcafe/compute/extensions/volumes_boot_api/volume_servers_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
import xml.etree.ElementTree as ET
from cloudcafe.compute.extensions.extensions_api.models.request import \

2
metatests/cloudcafe/compute/fixtures.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from httpretty import HTTPretty

2
metatests/cloudcafe/compute/flavors/models/test_flavor_access.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.flavors_api.models.flavor_access \
import FlavorAccess, FlavorAccessList

2
metatests/cloudcafe/compute/flavors/models/test_flavor_extra_specs.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.flavors_api.models.flavor_extra_specs \
import FlavorExtraSpecs

2
metatests/cloudcafe/compute/flavors/models/test_flavors.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.common.constants import Constants
from cloudcafe.compute.flavors_api.models.flavor import Flavor

2
metatests/cloudcafe/compute/hosts/models/test_hosts.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.hosts_api.models.hosts import Host

2
metatests/cloudcafe/compute/hypervisors/models/test_hypervisors.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.hypervisors_api.model.hypervisor import Hypervisors

2
metatests/cloudcafe/compute/hypervisors/models/test_hypervisors_min.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.hypervisors_api.model.hypervisor import HypervisorsMin

2
metatests/cloudcafe/compute/images/models/test_images.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.images_api.models.image import Image

2
metatests/cloudcafe/compute/limits/models/test_limits.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.limits_api.models.limit import TenantLimits

2
metatests/cloudcafe/compute/quotas/models/test_quota_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.quotas_api.models.requests import UpdateQuotaRequest

2
metatests/cloudcafe/compute/quotas/models/test_quotas.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.quotas_api.models.quotas import Quota

2
metatests/cloudcafe/compute/security_group_rules/models/test_security_group_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.security_groups_api.models.\
requests import CreateSecurityGroupRule

2
metatests/cloudcafe/compute/security_group_rules/models/test_security_group_rule.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.extensions.security_groups_api.models.\
security_group_rule import SecurityGroupRule

2
metatests/cloudcafe/compute/servers/models/servers_requests.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
import xml.etree.ElementTree as ET
from cloudcafe.compute.servers_api.models.requests import CreateServer

2
metatests/cloudcafe/compute/servers/models/test_servers.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.compute.common.types import ComputeTaskStates
from cloudcafe.compute.servers_api.models.servers import Server

2
metatests/cloudcafe/images/v2_0/client_test.py
View File

@@ -18,7 +18,7 @@ from copy import deepcopy
from httpretty import HTTPretty
import os
import re
import unittest2 as unittest
import unittest
from cloudcafe.images.v2.client import ImagesClient
from cloudcafe.images.v2.models.image import Image

2
metatests/cloudcafe/images/v2_0/models/image_test.py
View File

@@ -18,7 +18,7 @@ from copy import deepcopy
import dateutil.parser
import json
import os
import unittest2 as unittest
import unittest
from cloudcafe.images.common.types import (
ImageContainerFormat, ImageDiskFormat, ImageStatus, ImageVisibility)

2
metatests/cloudcafe/images/v2_0/models/member_test.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.images.v2.models.image import Member

2
metatests/cloudcafe/images/v2_0/models/members_test.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from cloudcafe.images.v2.models.image import Members, Member

2
metatests/cloudcafe/networking/lbaas/common/client.py
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import unittest2 as unittest
import unittest
from lbaascafe.lbaas.lbaas_api.clients.base_load_balancers_client \
import BaseLoadBalancersClient

1
test-requirements.txt
View File

@@ -1,4 +1,3 @@
httpretty
unittest2
mock
flake8