diff --git a/.testr.conf b/.testr.conf index d356fcf1e..2109af6ce 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./quantumclient/tests $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/MANIFEST.in b/MANIFEST.in index 41d72419d..251a20197 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,5 @@ include tox.ini include LICENSE README HACKING.rst include ChangeLog include tools/* -include quantumclient/tests/* -include quantumclient/tests/unit/* include quantumclient/versioninfo +recursive-include tests * diff --git a/quantumclient/tests/__init__.py b/tests/__init__.py similarity index 100% rename from quantumclient/tests/__init__.py rename to tests/__init__.py diff --git a/quantumclient/tests/unit/__init__.py b/tests/unit/__init__.py similarity index 100% rename from quantumclient/tests/unit/__init__.py rename to tests/unit/__init__.py diff --git a/quantumclient/tests/unit/lb/__init__.py b/tests/unit/lb/__init__.py similarity index 100% rename from quantumclient/tests/unit/lb/__init__.py rename to tests/unit/lb/__init__.py diff --git a/quantumclient/tests/unit/lb/test_cli20_healthmonitor.py b/tests/unit/lb/test_cli20_healthmonitor.py similarity index 99% rename from quantumclient/tests/unit/lb/test_cli20_healthmonitor.py rename to tests/unit/lb/test_cli20_healthmonitor.py index ab5327c59..ed0086a75 100644 --- a/quantumclient/tests/unit/lb/test_cli20_healthmonitor.py +++ b/tests/unit/lb/test_cli20_healthmonitor.py @@ -22,7 +22,7 @@ import sys from mox import ContainsKeyValue from quantumclient.quantum.v2_0.lb import healthmonitor -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20LbHealthmonitor(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/lb/test_cli20_member.py b/tests/unit/lb/test_cli20_member.py similarity index 99% rename from quantumclient/tests/unit/lb/test_cli20_member.py rename to tests/unit/lb/test_cli20_member.py index 2913d4c45..6f80fd845 100644 --- a/quantumclient/tests/unit/lb/test_cli20_member.py +++ b/tests/unit/lb/test_cli20_member.py @@ -20,7 +20,7 @@ import sys from quantumclient.quantum.v2_0.lb import member -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20LbMember(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/lb/test_cli20_pool.py b/tests/unit/lb/test_cli20_pool.py similarity index 99% rename from quantumclient/tests/unit/lb/test_cli20_pool.py rename to tests/unit/lb/test_cli20_pool.py index 4bf6d3c47..b02b0baac 100644 --- a/quantumclient/tests/unit/lb/test_cli20_pool.py +++ b/tests/unit/lb/test_cli20_pool.py @@ -22,7 +22,7 @@ import sys from mox import ContainsKeyValue from quantumclient.quantum.v2_0.lb import pool -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20LbPool(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/lb/test_cli20_vip.py b/tests/unit/lb/test_cli20_vip.py similarity index 99% rename from quantumclient/tests/unit/lb/test_cli20_vip.py rename to tests/unit/lb/test_cli20_vip.py index 878e99f95..c42a29bd5 100644 --- a/quantumclient/tests/unit/lb/test_cli20_vip.py +++ b/tests/unit/lb/test_cli20_vip.py @@ -20,7 +20,7 @@ import sys from quantumclient.quantum.v2_0.lb import vip -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20LbVip(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/test_auth.py b/tests/unit/test_auth.py similarity index 100% rename from quantumclient/tests/unit/test_auth.py rename to tests/unit/test_auth.py diff --git a/quantumclient/tests/unit/test_casual_args.py b/tests/unit/test_casual_args.py similarity index 100% rename from quantumclient/tests/unit/test_casual_args.py rename to tests/unit/test_casual_args.py diff --git a/quantumclient/tests/unit/test_cli20.py b/tests/unit/test_cli20.py similarity index 100% rename from quantumclient/tests/unit/test_cli20.py rename to tests/unit/test_cli20.py diff --git a/quantumclient/tests/unit/test_cli20_floatingips.py b/tests/unit/test_cli20_floatingips.py similarity index 98% rename from quantumclient/tests/unit/test_cli20_floatingips.py rename to tests/unit/test_cli20_floatingips.py index 620470d3c..854bf1ec0 100644 --- a/quantumclient/tests/unit/test_cli20_floatingips.py +++ b/tests/unit/test_cli20_floatingips.py @@ -25,8 +25,8 @@ from quantumclient.quantum.v2_0.floatingip import DeleteFloatingIP from quantumclient.quantum.v2_0.floatingip import DisassociateFloatingIP from quantumclient.quantum.v2_0.floatingip import ListFloatingIP from quantumclient.quantum.v2_0.floatingip import ShowFloatingIP -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20FloatingIps(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_network.py b/tests/unit/test_cli20_network.py similarity index 99% rename from quantumclient/tests/unit/test_cli20_network.py rename to tests/unit/test_cli20_network.py index a0a7c9064..18e3a2c42 100644 --- a/quantumclient/tests/unit/test_cli20_network.py +++ b/tests/unit/test_cli20_network.py @@ -29,9 +29,9 @@ from quantumclient.quantum.v2_0.network import ListNetwork from quantumclient.quantum.v2_0.network import ShowNetwork from quantumclient.quantum.v2_0.network import UpdateNetwork from quantumclient import shell -from quantumclient.tests.unit import test_cli20 -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit import test_cli20 +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20Network(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_nvp_queue.py b/tests/unit/test_cli20_nvp_queue.py similarity index 98% rename from quantumclient/tests/unit/test_cli20_nvp_queue.py rename to tests/unit/test_cli20_nvp_queue.py index 96ed11a0d..c43f31acb 100644 --- a/quantumclient/tests/unit/test_cli20_nvp_queue.py +++ b/tests/unit/test_cli20_nvp_queue.py @@ -19,7 +19,7 @@ import sys from quantumclient.quantum.v2_0 import nvp_qos_queue as qos -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20NvpQosQueue(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_nvpnetworkgateway.py b/tests/unit/test_cli20_nvpnetworkgateway.py similarity index 97% rename from quantumclient/tests/unit/test_cli20_nvpnetworkgateway.py rename to tests/unit/test_cli20_nvpnetworkgateway.py index 7f17571d4..31f7e1ae1 100644 --- a/quantumclient/tests/unit/test_cli20_nvpnetworkgateway.py +++ b/tests/unit/test_cli20_nvpnetworkgateway.py @@ -19,8 +19,8 @@ import sys from quantumclient.common import exceptions from quantumclient.quantum.v2_0 import nvpnetworkgateway -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20NetworkGateway(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_port.py b/tests/unit/test_cli20_port.py similarity index 98% rename from quantumclient/tests/unit/test_cli20_port.py rename to tests/unit/test_cli20_port.py index 65cfc99a5..84e11bff0 100644 --- a/quantumclient/tests/unit/test_cli20_port.py +++ b/tests/unit/test_cli20_port.py @@ -26,9 +26,9 @@ from quantumclient.quantum.v2_0.port import ListPort from quantumclient.quantum.v2_0.port import ListRouterPort from quantumclient.quantum.v2_0.port import ShowPort from quantumclient.quantum.v2_0.port import UpdatePort -from quantumclient.tests.unit import test_cli20 -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit import test_cli20 +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20Port(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_router.py b/tests/unit/test_cli20_router.py similarity index 98% rename from quantumclient/tests/unit/test_cli20_router.py rename to tests/unit/test_cli20_router.py index 1875b8abf..e9e661c11 100644 --- a/quantumclient/tests/unit/test_cli20_router.py +++ b/tests/unit/test_cli20_router.py @@ -27,8 +27,8 @@ from quantumclient.quantum.v2_0.router import RemoveInterfaceRouter from quantumclient.quantum.v2_0.router import SetGatewayRouter from quantumclient.quantum.v2_0.router import ShowRouter from quantumclient.quantum.v2_0.router import UpdateRouter -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20Router(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_securitygroup.py b/tests/unit/test_cli20_securitygroup.py similarity index 99% rename from quantumclient/tests/unit/test_cli20_securitygroup.py rename to tests/unit/test_cli20_securitygroup.py index 2884e3b2c..77cbdaf3d 100644 --- a/quantumclient/tests/unit/test_cli20_securitygroup.py +++ b/tests/unit/test_cli20_securitygroup.py @@ -21,7 +21,7 @@ import sys import mox from quantumclient.quantum.v2_0 import securitygroup -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20SecurityGroups(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/test_cli20_subnet.py b/tests/unit/test_cli20_subnet.py similarity index 99% rename from quantumclient/tests/unit/test_cli20_subnet.py rename to tests/unit/test_cli20_subnet.py index ca2794502..7bbe7ea0c 100644 --- a/quantumclient/tests/unit/test_cli20_subnet.py +++ b/tests/unit/test_cli20_subnet.py @@ -22,8 +22,8 @@ from quantumclient.quantum.v2_0.subnet import DeleteSubnet from quantumclient.quantum.v2_0.subnet import ListSubnet from quantumclient.quantum.v2_0.subnet import ShowSubnet from quantumclient.quantum.v2_0.subnet import UpdateSubnet -from quantumclient.tests.unit.test_cli20 import CLITestV20Base -from quantumclient.tests.unit.test_cli20 import MyApp +from tests.unit.test_cli20 import CLITestV20Base +from tests.unit.test_cli20 import MyApp class CLITestV20Subnet(CLITestV20Base): diff --git a/quantumclient/tests/unit/test_name_or_id.py b/tests/unit/test_name_or_id.py similarity index 99% rename from quantumclient/tests/unit/test_name_or_id.py rename to tests/unit/test_name_or_id.py index 3b01a1c9b..d5fd9fd14 100644 --- a/quantumclient/tests/unit/test_name_or_id.py +++ b/tests/unit/test_name_or_id.py @@ -23,7 +23,7 @@ import testtools from quantumclient.common import exceptions from quantumclient.quantum import v2_0 as quantumv20 -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 from quantumclient.v2_0.client import Client diff --git a/quantumclient/tests/unit/test_quota.py b/tests/unit/test_quota.py similarity index 97% rename from quantumclient/tests/unit/test_quota.py rename to tests/unit/test_quota.py index 72d589860..633ff62af 100644 --- a/quantumclient/tests/unit/test_quota.py +++ b/tests/unit/test_quota.py @@ -19,7 +19,7 @@ import sys from quantumclient.common import exceptions from quantumclient.quantum.v2_0 import quota as test_quota -from quantumclient.tests.unit import test_cli20 +from tests.unit import test_cli20 class CLITestV20Quota(test_cli20.CLITestV20Base): diff --git a/quantumclient/tests/unit/test_shell.py b/tests/unit/test_shell.py similarity index 100% rename from quantumclient/tests/unit/test_shell.py rename to tests/unit/test_shell.py