move unit tests to new "unit" test module

this will better isolate the unit tests from the functional tests.
unfortunately, the "integration" tests had to be lumped into the
"unit" tests since we need the separation in testr.conf

Change-Id: Ifd12198c1f90e4e3c951c73bfa1884ab300d8ded
This commit is contained in:
Steve Martinelli 2016-09-05 22:14:33 -07:00
parent 7d1a5d0854
commit 39839def2e
126 changed files with 492 additions and 206 deletions

View File

@ -2,7 +2,7 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./openstackclient/tests} $LISTOPT $IDOPTION
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./openstackclient/tests/unit} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

View File

@ -16,7 +16,7 @@
from keystoneauth1 import session
from requests_mock.contrib import fixture
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
RESP_ITEM_1 = {

View File

@ -16,7 +16,7 @@
from osc_lib import exceptions
from openstackclient.api import api
from openstackclient.tests.api import fakes as api_fakes
from openstackclient.tests.unit.api import fakes as api_fakes
class TestKeystoneSession(api_fakes.TestSession):

View File

@ -17,7 +17,7 @@ from keystoneauth1 import session
from requests_mock.contrib import fixture
from openstackclient.api import image_v1
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
FAKE_PROJECT = 'xyzpdq'

View File

@ -17,7 +17,7 @@ from keystoneauth1 import session
from requests_mock.contrib import fixture
from openstackclient.api import image_v2
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
FAKE_PROJECT = 'xyzpdq'

View File

@ -19,7 +19,7 @@ from keystoneauth1 import session
from requests_mock.contrib import fixture
from openstackclient.api import object_store_v1 as object_store
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
FAKE_ACCOUNT = 'q12we34r'

View File

@ -17,7 +17,7 @@ import copy
from openstackclient.api import api
from openstackclient.api import utils as api_utils
from openstackclient.tests.api import fakes as api_fakes
from openstackclient.tests.unit.api import fakes as api_fakes
class TestBaseAPIFilter(api_fakes.TestSession):

View File

@ -16,11 +16,11 @@ import mock
import six
from openstackclient.common import availability_zone
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils
from openstackclient.tests.volume.v2 import fakes as volume_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
def _build_compute_az_datalist(compute_az, long_datalist=False):

View File

@ -19,7 +19,7 @@ from keystoneauth1 import token_endpoint
from osc_lib.tests import utils as osc_lib_test_utils
from openstackclient.common import clientmanager
from openstackclient.tests import fakes
from openstackclient.tests.unit import fakes
class TestClientManager(osc_lib_test_utils.TestClientManager):

View File

@ -17,8 +17,8 @@ import mock
from osc_lib import exceptions
from openstackclient.common import command
from openstackclient.tests import fakes as test_fakes
from openstackclient.tests import utils as test_utils
from openstackclient.tests.unit import fakes as test_fakes
from openstackclient.tests.unit import utils as test_utils
class FakeCommand(command.Command):
@ -32,7 +32,7 @@ class TestCommand(test_utils.TestCase):
def test_command_has_logger(self):
cmd = FakeCommand(mock.Mock(), mock.Mock())
self.assertTrue(hasattr(cmd, 'log'))
self.assertEqual('openstackclient.tests.common.test_command.'
self.assertEqual('openstackclient.tests.unit.common.test_command.'
'FakeCommand', cmd.log.name)
def test_validate_os_beta_command_enabled(self):

View File

@ -16,7 +16,7 @@
import mock
from openstackclient.common import commandmanager
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
class FakeCommand(object):

View File

@ -14,8 +14,8 @@
import mock
from openstackclient.common import configuration
from openstackclient.tests import fakes
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit import utils
class TestConfiguration(utils.TestCommand):

View File

@ -14,12 +14,12 @@
import mock
from openstackclient.common import extension
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils
from openstackclient.tests.volume.v2 import fakes as volume_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
class TestExtension(utils.TestCommand):

View File

@ -18,7 +18,7 @@ import logging
import mock
from openstackclient.common import logs
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
class TestContext(utils.TestCase):

View File

@ -18,8 +18,8 @@
import mock
from openstackclient.common import module as osc_module
from openstackclient.tests import fakes
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit import utils
# NOTE(dtroyer): module_1 must match the version list filter (not --all)

View File

@ -19,7 +19,7 @@
import argparse
from openstackclient.common import parseractions
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
class TestKeyValueAction(utils.TestCase):

View File

@ -14,10 +14,10 @@ import copy
import mock
from openstackclient.common import quota
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
class FakeQuotaResource(fakes.FakeResource):

View File

@ -17,12 +17,12 @@ import copy
import mock
import uuid
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils
from openstackclient.tests.volume.v2 import fakes as volume_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
floating_ip_num = 100
fix_ip_num = 100

View File

@ -19,8 +19,8 @@ from mock import call
from osc_lib import exceptions
from openstackclient.compute.v2 import agent
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestAgent(compute_fakes.TestComputev2):

View File

@ -20,8 +20,8 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.compute.v2 import aggregate
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestAggregate(compute_fakes.TestComputev2):

View File

@ -16,7 +16,7 @@
import mock
from openstackclient.compute.v2 import console
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
class TestConsole(compute_fakes.TestComputev2):

View File

@ -20,9 +20,9 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.compute.v2 import flavor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestFlavor(compute_fakes.TestComputev2):

View File

@ -14,8 +14,8 @@
#
from openstackclient.compute.v2 import host
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestHost(compute_fakes.TestComputev2):

View File

@ -18,8 +18,8 @@ import copy
from osc_lib import exceptions
from openstackclient.compute.v2 import hypervisor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
class TestHypervisor(compute_fakes.TestComputev2):

View File

@ -14,7 +14,7 @@
#
from openstackclient.compute.v2 import hypervisor_stats
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
class TestHypervisorStats(compute_fakes.TestComputev2):

View File

@ -20,8 +20,8 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.compute.v2 import keypair
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestKeypair(compute_fakes.TestComputev2):

View File

@ -21,10 +21,10 @@ from osc_lib import exceptions
from osc_lib import utils as common_utils
from openstackclient.compute.v2 import server
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests import utils
from openstackclient.tests.volume.v2 import fakes as volume_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
class TestServer(compute_fakes.TestComputev2):

View File

@ -17,8 +17,8 @@ from osc_lib import exceptions
from osc_lib import utils as common_utils
from openstackclient.compute.v2 import server_backup
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
class TestServerBackup(compute_fakes.TestComputev2):

View File

@ -19,8 +19,8 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.compute.v2 import server_group
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestServerGroup(compute_fakes.TestComputev2):

View File

@ -16,8 +16,8 @@ from osc_lib import exceptions
from osc_lib import utils as common_utils
from openstackclient.compute.v2 import server_image
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
class TestServerImage(compute_fakes.TestComputev2):

View File

@ -19,7 +19,7 @@ from mock import call
from osc_lib import exceptions
from openstackclient.compute.v2 import service
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
class TestService(compute_fakes.TestComputev2):

View File

@ -20,8 +20,8 @@ import uuid
from keystoneauth1 import access
from keystoneauth1 import fixture
from openstackclient.tests import fakes
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit import utils
project_id = '8-9-64'

View File

@ -14,8 +14,8 @@
import mock
from openstackclient.identity.v2_0 import catalog
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests import utils
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit import utils
class TestCatalog(utils.TestCommand):

View File

@ -12,7 +12,7 @@
#
from openstackclient.identity.v2_0 import endpoint
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestEndpoint(identity_fakes.TestIdentityv2):

View File

@ -17,7 +17,7 @@ from keystoneauth1 import exceptions as ks_exc
from osc_lib import exceptions
from openstackclient.identity.v2_0 import project
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestProject(identity_fakes.TestIdentityv2):

View File

@ -19,7 +19,7 @@ from keystoneauth1 import exceptions as ks_exc
from osc_lib import exceptions
from openstackclient.identity.v2_0 import role
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestRole(identity_fakes.TestIdentityv2):

View File

@ -17,8 +17,8 @@ import mock
from osc_lib import exceptions
from openstackclient.identity.v2_0 import role_assignment
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestRoleAssignment(identity_fakes.TestIdentityv2):

View File

@ -17,7 +17,7 @@ from keystoneclient import exceptions as identity_exc
from osc_lib import exceptions
from openstackclient.identity.v2_0 import service
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestService(identity_fakes.TestIdentityv2):

View File

@ -16,7 +16,7 @@
import mock
from openstackclient.identity.v2_0 import token
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestToken(identity_fakes.TestIdentityv2):

View File

@ -19,7 +19,7 @@ from keystoneauth1 import exceptions as ks_exc
from osc_lib import exceptions
from openstackclient.identity.v2_0 import user
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
class TestUser(identity_fakes.TestIdentityv2):

View File

@ -20,8 +20,8 @@ import uuid
from keystoneauth1 import access
from keystoneauth1 import fixture
from openstackclient.tests import fakes
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit import utils
base_url = 'http://identity:5000/v3/'

View File

@ -14,8 +14,8 @@
import mock
from openstackclient.identity.v3 import catalog
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests import utils
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import utils
class TestCatalog(utils.TestCommand):

View File

@ -13,8 +13,8 @@
import copy
from openstackclient.identity.v3 import consumer
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestOAuth1(identity_fakes.TestOAuth1):

View File

@ -16,8 +16,8 @@ from mock import call
from osc_lib import exceptions
from openstackclient.identity.v3 import credential
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests import utils
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import utils
class TestCredential(identity_fakes.TestIdentityv3):

View File

@ -11,7 +11,7 @@
# under the License.
from openstackclient.identity.v3 import domain
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestDomain(identity_fakes.TestIdentityv3):

View File

@ -11,7 +11,7 @@
# under the License.
from openstackclient.identity.v3 import endpoint
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestEndpoint(identity_fakes.TestIdentityv3):

View File

@ -18,7 +18,7 @@ from keystoneauth1 import exceptions as ks_exc
from osc_lib import exceptions
from openstackclient.identity.v3 import group
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestGroup(identity_fakes.TestIdentityv3):

View File

@ -16,8 +16,8 @@ import copy
import mock
from openstackclient.identity.v3 import identity_provider
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestIdentityProvider(identity_fakes.TestFederatedIdentity):

View File

@ -18,8 +18,8 @@ import mock
from osc_lib import exceptions
from openstackclient.identity.v3 import mapping
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestMapping(identity_fakes.TestFederatedIdentity):

View File

@ -13,8 +13,8 @@
import copy
from openstackclient.identity.v3 import token
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestOAuth1(identity_fakes.TestOAuth1):

View File

@ -18,7 +18,7 @@ import mock
from osc_lib import exceptions
from openstackclient.identity.v3 import project
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestProject(identity_fakes.TestIdentityv3):

View File

@ -15,8 +15,8 @@
import copy
from openstackclient.identity.v3 import federation_protocol
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestProtocol(identity_fakes.TestFederatedIdentity):

View File

@ -14,8 +14,8 @@
import copy
from openstackclient.identity.v3 import region
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestRegion(identity_fakes.TestIdentityv3):

View File

@ -16,8 +16,8 @@
import copy
from openstackclient.identity.v3 import role
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestRole(identity_fakes.TestIdentityv3):

View File

@ -15,8 +15,8 @@ import copy
import mock
from openstackclient.identity.v3 import role_assignment
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestRoleAssignment(identity_fakes.TestIdentityv3):

View File

@ -17,7 +17,7 @@ from keystoneclient import exceptions as identity_exc
from osc_lib import exceptions
from openstackclient.identity.v3 import service
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestService(identity_fakes.TestIdentityv3):

View File

@ -15,8 +15,8 @@
import copy
from openstackclient.identity.v3 import service_provider
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as service_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as service_fakes
class TestServiceProvider(service_fakes.TestFederatedIdentity):

View File

@ -16,7 +16,7 @@
import mock
from openstackclient.identity.v3 import token
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestToken(identity_fakes.TestIdentityv3):

View File

@ -14,8 +14,8 @@
import copy
from openstackclient.identity.v3 import trust
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestTrust(identity_fakes.TestIdentityv3):

View File

@ -15,8 +15,8 @@ import copy
from osc_lib import exceptions
from openstackclient.identity.v3 import unscoped_saml
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestUnscopedSAML(identity_fakes.TestFederatedIdentity):

View File

@ -17,7 +17,7 @@ import contextlib
import mock
from openstackclient.identity.v3 import user
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
class TestUser(identity_fakes.TestIdentityv3):

View File

@ -15,9 +15,9 @@
import mock
from openstackclient.tests import fakes
from openstackclient.tests import utils
from openstackclient.tests.volume.v1 import fakes as volume_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit import utils
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
image_id = 'im1'

View File

@ -19,8 +19,8 @@ import mock
from osc_lib import exceptions
from openstackclient.image.v1 import image
from openstackclient.tests import fakes
from openstackclient.tests.image.v1 import fakes as image_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.image.v1 import fakes as image_fakes
class TestImage(image_fakes.TestImagev1):

View File

@ -22,9 +22,9 @@ from glanceclient.v2 import schemas
from osc_lib import utils as common_utils
import warlock
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit import utils
image_id = '0f41529e-7c12-4de8-be2d-181abb825b3c'
image_name = 'graven'

View File

@ -22,8 +22,8 @@ from osc_lib import utils as common_utils
import warlock
from openstackclient.image.v2 import image
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.image.v2 import fakes as image_fakes
class TestImage(image_fakes.TestImagev2):

View File

@ -13,8 +13,8 @@
from keystoneauth1 import fixture as ksa_fixture
from requests_mock.contrib import fixture
from openstackclient.tests import test_shell
from openstackclient.tests import utils
from openstackclient.tests.unit import test_shell
from openstackclient.tests.unit import utils
HOST = "192.168.5.41"

View File

@ -15,8 +15,8 @@ import copy
from osc_lib.tests import utils as osc_lib_utils
from openstackclient import shell
from openstackclient.tests.integ import base as test_base
from openstackclient.tests import test_shell
from openstackclient.tests.unit.integ import base as test_base
from openstackclient.tests.unit import test_shell
class TestIntegV2ProjectID(test_base.TestInteg):

View File

@ -16,8 +16,8 @@ import mock
from osc_lib.tests import utils as osc_lib_utils
from openstackclient import shell
from openstackclient.tests.integ import base as test_base
from openstackclient.tests import test_shell
from openstackclient.tests.unit.integ import base as test_base
from openstackclient.tests.unit import test_shell
class TestIntegShellCliV2(test_base.TestInteg):

View File

@ -15,7 +15,7 @@ import argparse
import mock
from openstackclient.network import common
from openstackclient.tests import utils
from openstackclient.tests.unit import utils
def _add_common_argument(parser):

View File

@ -16,9 +16,9 @@ import copy
import mock
import uuid
from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.unit import utils
QUOTA = {

View File

@ -17,9 +17,9 @@ from mock import call
from osc_lib import exceptions
from openstackclient.network.v2 import address_scope
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestAddressScope(network_fakes.TestNetworkV2):

View File

@ -17,9 +17,9 @@ from mock import call
from osc_lib import exceptions
from openstackclient.network.v2 import floating_ip
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
# Tests for Neutron network

View File

@ -14,8 +14,8 @@
from osc_lib import exceptions
from openstackclient.network.v2 import floating_ip_pool
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
# Tests for Network API v2

View File

@ -16,9 +16,9 @@ import mock
from osc_lib import utils as common_utils
from openstackclient.network.v2 import ip_availability
from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestIPAvailability(network_fakes.TestNetworkV2):

View File

@ -18,12 +18,12 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.network.v2 import network
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes_v2
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes_v2
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
# Tests for Neutron network

View File

@ -18,8 +18,8 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.network.v2 import network_agent
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestNetworkAgent(network_fakes.TestNetworkV2):

View File

@ -17,9 +17,9 @@ from mock import call
from osc_lib import exceptions
from openstackclient.network.v2 import network_rbac
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestNetworkRBAC(network_fakes.TestNetworkV2):

View File

@ -16,8 +16,8 @@ import mock
from osc_lib import exceptions
from openstackclient.network.v2 import network_segment
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestNetworkSegment(network_fakes.TestNetworkV2):

View File

@ -19,8 +19,8 @@ from osc_lib import exceptions
from osc_lib import utils
from openstackclient.network.v2 import port
from openstackclient.tests.network.v2 import fakes as network_fakes
from openstackclient.tests import utils as tests_utils
from openstackclient.tests.unit.network.v2 import fakes as network_fakes
from openstackclient.tests.unit import utils as tests_utils
class TestPort(network_fakes.TestNetworkV2):

4