Move tests into the novaclient package.
tests/__init__.py implies a package in the global namespace. These tests are not global python tests, but rather tests for novaclient. Change-Id: Ifeb8082aa010d15dddc9ae02e35589bc78ad48cc
This commit is contained in:
parent
51f05965e0
commit
c34c371e96
.testr.conf
novaclient/tests
__init__.pyfakes.pytest_auth_plugins.pytest_base.pytest_client.pytest_discover.pytest_http.pytest_service_catalog.pytest_shell.pytest_utils.pyutils.py
v1_1
__init__.py
contrib
__init__.pyfakes.pytest_baremetal.pytest_instance_actions.pytest_list_extensions.pytest_tenant_networks.py
fakes.pytest_agents.pytest_aggregates.pytest_auth.pytest_availability_zone.pytest_certs.pytest_cloudpipe.pytest_coverage_ext.pytest_fixed_ips.pytest_flavor_access.pytest_flavors.pytest_floating_ip_dns.pytest_floating_ip_pools.pytest_floating_ips.pytest_floating_ips_bulk.pytest_fping.pytest_hosts.pytest_hypervisors.pytest_images.pytest_keypairs.pytest_limits.pytest_networks.pytest_quota_classes.pytest_quotas.pytest_security_group_rules.pytest_security_groups.pytest_servers.pytest_services.pytest_shell.pytest_usage.pytestfile.txtutils.py@ -1,4 +1,4 @@
|
||||
[DEFAULT]
|
||||
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
|
||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
||||
|
@ -26,7 +26,7 @@ except ImportError:
|
||||
from novaclient import auth_plugin
|
||||
from novaclient import exceptions
|
||||
from novaclient.v1_1 import client
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
def mock_http_request(resp=None):
|
@ -1,8 +1,8 @@
|
||||
from novaclient import base
|
||||
from novaclient import exceptions
|
||||
from novaclient.v1_1 import flavors
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -19,7 +19,7 @@ import requests
|
||||
|
||||
import novaclient.client
|
||||
import novaclient.v1_1.client
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
class ClientTest(utils.TestCase):
|
@ -19,7 +19,7 @@ import inspect
|
||||
import pkg_resources
|
||||
|
||||
import novaclient.shell
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
class DiscoverTest(utils.TestCase):
|
@ -3,7 +3,7 @@ import requests
|
||||
|
||||
from novaclient import client
|
||||
from novaclient import exceptions
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
fake_response = utils.TestResponse({
|
@ -1,6 +1,6 @@
|
||||
from novaclient import exceptions
|
||||
from novaclient import service_catalog
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
# Taken directly from keystone/content/common/samples/auth.json
|
@ -9,7 +9,7 @@ from testtools import matchers
|
||||
import novaclient.client
|
||||
from novaclient import exceptions
|
||||
import novaclient.shell
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
FAKE_ENV = {'OS_USERNAME': 'username',
|
||||
'OS_PASSWORD': 'password',
|
@ -6,7 +6,7 @@ import mock
|
||||
from novaclient import exceptions
|
||||
from novaclient import utils
|
||||
from novaclient import base
|
||||
from tests import utils as test_utils
|
||||
from novaclient.tests import utils as test_utils
|
||||
|
||||
UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
|
||||
|
@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
from novaclient.v1_1 import client
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
class FakeClient(fakes.FakeClient):
|
@ -17,8 +17,8 @@
|
||||
from novaclient import extension
|
||||
from novaclient.v1_1.contrib import baremetal
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1.contrib import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
|
||||
|
||||
extensions = [
|
4
tests/v1_1/contrib/test_instance_actions.py → novaclient/tests/v1_1/contrib/test_instance_actions.py
4
tests/v1_1/contrib/test_instance_actions.py → novaclient/tests/v1_1/contrib/test_instance_actions.py
@ -15,8 +15,8 @@
|
||||
from novaclient import extension
|
||||
from novaclient.v1_1.contrib import instance_action
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1.contrib import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
|
||||
|
||||
extensions = [
|
4
tests/v1_1/contrib/test_list_extensions.py → novaclient/tests/v1_1/contrib/test_list_extensions.py
4
tests/v1_1/contrib/test_list_extensions.py → novaclient/tests/v1_1/contrib/test_list_extensions.py
@ -1,8 +1,8 @@
|
||||
from novaclient import extension
|
||||
from novaclient.v1_1.contrib import list_extensions
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
extensions = [
|
4
tests/v1_1/contrib/test_tenant_networks.py → novaclient/tests/v1_1/contrib/test_tenant_networks.py
4
tests/v1_1/contrib/test_tenant_networks.py → novaclient/tests/v1_1/contrib/test_tenant_networks.py
@ -18,8 +18,8 @@
|
||||
from novaclient import extension
|
||||
from novaclient.v1_1.contrib import tenant_networks
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1.contrib import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
|
||||
|
||||
extensions = [
|
@ -19,8 +19,8 @@ import urlparse
|
||||
|
||||
from novaclient import client as base_client
|
||||
from novaclient.v1_1 import client
|
||||
from tests import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
class FakeClient(fakes.FakeClient, client.Client):
|
@ -16,8 +16,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import agents
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -14,8 +14,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import aggregates
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -6,7 +6,7 @@ import requests
|
||||
|
||||
from novaclient.v1_1 import client
|
||||
from novaclient import exceptions
|
||||
from tests import utils
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
class AuthenticateAgainstKeystoneTests(utils.TestCase):
|
@ -16,8 +16,8 @@
|
||||
|
||||
from novaclient.v1_1 import availability_zones
|
||||
from novaclient.v1_1 import shell
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import certs
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import cloudpipe
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -17,8 +17,8 @@
|
||||
# See: http://wiki.openstack.org/Nova/CoverageExtension for more information
|
||||
# and usage explanation for this API extension
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -15,8 +15,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
cs = fakes.FakeClient()
|
||||
|
@ -14,8 +14,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import flavor_access
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,7 +1,7 @@
|
||||
from novaclient import exceptions
|
||||
from novaclient.v1_1 import flavors
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import floating_ip_dns
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -15,8 +15,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import floating_ip_pools
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -15,8 +15,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import floating_ips
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -15,8 +15,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from novaclient.v1_1 import floating_ips_bulk
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -16,8 +16,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import fping
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import hosts
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import images
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import keypairs
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,7 +1,7 @@
|
||||
|
||||
from novaclient.v1_1 import limits
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import networks
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
cs = fakes.FakeClient()
|
||||
|
@ -1,7 +1,7 @@
|
||||
from novaclient import exceptions
|
||||
from novaclient.v1_1 import security_group_rules
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -1,6 +1,6 @@
|
||||
from novaclient.v1_1 import security_groups
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -6,8 +6,8 @@ import mock
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient.v1_1 import servers
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -16,8 +16,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient.v1_1 import services
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -29,8 +29,8 @@ import novaclient.client
|
||||
from novaclient import exceptions
|
||||
from novaclient.openstack.common import timeutils
|
||||
import novaclient.shell
|
||||
from tests.v1_1 import fakes
|
||||
from tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
|
||||
|
||||
class ShellFixture(fixtures.Fixture):
|
@ -1,8 +1,8 @@
|
||||
import datetime
|
||||
|
||||
from novaclient.v1_1 import usage
|
||||
from tests import utils
|
||||
from tests.v1_1 import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
Loading…
x
Reference in New Issue
Block a user