diff --git a/tests/__init__.py b/cinderclient/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to cinderclient/tests/__init__.py diff --git a/tests/fakes.py b/cinderclient/tests/fakes.py similarity index 100% rename from tests/fakes.py rename to cinderclient/tests/fakes.py diff --git a/tests/test_base.py b/cinderclient/tests/test_base.py similarity index 95% rename from tests/test_base.py rename to cinderclient/tests/test_base.py index 7eba9864a..75c37e6b9 100644 --- a/tests/test_base.py +++ b/cinderclient/tests/test_base.py @@ -1,8 +1,8 @@ from cinderclient import base from cinderclient import exceptions from cinderclient.v1 import volumes -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/test_client.py b/cinderclient/tests/test_client.py similarity index 94% rename from tests/test_client.py rename to cinderclient/tests/test_client.py index 1b7297184..17b2b8849 100644 --- a/tests/test_client.py +++ b/cinderclient/tests/test_client.py @@ -2,7 +2,7 @@ import cinderclient.client import cinderclient.v1.client import cinderclient.v2.client -from tests import utils +from cinderclient.tests import utils class ClientTest(utils.TestCase): diff --git a/tests/test_http.py b/cinderclient/tests/test_http.py similarity index 99% rename from tests/test_http.py rename to cinderclient/tests/test_http.py index cfc188570..3b93a4b2a 100644 --- a/tests/test_http.py +++ b/cinderclient/tests/test_http.py @@ -4,7 +4,7 @@ import requests from cinderclient import client from cinderclient import exceptions -from tests import utils +from cinderclient.tests import utils fake_response = utils.TestResponse({ diff --git a/tests/test_service_catalog.py b/cinderclient/tests/test_service_catalog.py similarity index 99% rename from tests/test_service_catalog.py rename to cinderclient/tests/test_service_catalog.py index 8dabd99a6..c9d98193d 100644 --- a/tests/test_service_catalog.py +++ b/cinderclient/tests/test_service_catalog.py @@ -1,6 +1,6 @@ from cinderclient import exceptions from cinderclient import service_catalog -from tests import utils +from cinderclient.tests import utils # Taken directly from keystone/content/common/samples/auth.json diff --git a/tests/test_shell.py b/cinderclient/tests/test_shell.py similarity index 98% rename from tests/test_shell.py rename to cinderclient/tests/test_shell.py index 580dd25f7..8ebe0f7ad 100644 --- a/tests/test_shell.py +++ b/cinderclient/tests/test_shell.py @@ -8,7 +8,7 @@ from testtools import matchers from cinderclient import exceptions import cinderclient.shell -from tests import utils +from cinderclient.tests import utils class ShellTest(utils.TestCase): diff --git a/tests/test_utils.py b/cinderclient/tests/test_utils.py similarity index 98% rename from tests/test_utils.py rename to cinderclient/tests/test_utils.py index af3f2dd42..95b50d0a0 100644 --- a/tests/test_utils.py +++ b/cinderclient/tests/test_utils.py @@ -5,7 +5,7 @@ import sys from cinderclient import exceptions from cinderclient import utils from cinderclient import base -from tests import utils as test_utils +from cinderclient.tests import utils as test_utils UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0' diff --git a/tests/utils.py b/cinderclient/tests/utils.py similarity index 100% rename from tests/utils.py rename to cinderclient/tests/utils.py diff --git a/tests/v1/__init__.py b/cinderclient/tests/v1/__init__.py similarity index 100% rename from tests/v1/__init__.py rename to cinderclient/tests/v1/__init__.py diff --git a/tests/v1/contrib/__init__.py b/cinderclient/tests/v1/contrib/__init__.py similarity index 100% rename from tests/v1/contrib/__init__.py rename to cinderclient/tests/v1/contrib/__init__.py diff --git a/tests/v1/contrib/test_list_extensions.py b/cinderclient/tests/v1/contrib/test_list_extensions.py similarity index 87% rename from tests/v1/contrib/test_list_extensions.py rename to cinderclient/tests/v1/contrib/test_list_extensions.py index faf10bb83..8066c5471 100644 --- a/tests/v1/contrib/test_list_extensions.py +++ b/cinderclient/tests/v1/contrib/test_list_extensions.py @@ -1,8 +1,8 @@ from cinderclient import extension from cinderclient.v1.contrib import list_extensions -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes extensions = [ diff --git a/tests/v1/fakes.py b/cinderclient/tests/v1/fakes.py similarity index 99% rename from tests/v1/fakes.py rename to cinderclient/tests/v1/fakes.py index b78e8ef98..411c5e191 100644 --- a/tests/v1/fakes.py +++ b/cinderclient/tests/v1/fakes.py @@ -16,9 +16,9 @@ import urlparse from cinderclient import client as base_client +from cinderclient.tests import fakes +import cinderclient.tests.utils as utils from cinderclient.v1 import client -from tests import fakes -import tests.utils as utils def _stub_volume(**kwargs): diff --git a/tests/v1/test_auth.py b/cinderclient/tests/v1/test_auth.py similarity index 99% rename from tests/v1/test_auth.py rename to cinderclient/tests/v1/test_auth.py index c0b59e940..704eacc0f 100644 --- a/tests/v1/test_auth.py +++ b/cinderclient/tests/v1/test_auth.py @@ -5,7 +5,7 @@ import requests from cinderclient.v1 import client from cinderclient import exceptions -from tests import utils +from cinderclient.tests import utils class AuthenticateAgainstKeystoneTests(utils.TestCase): diff --git a/tests/v1/test_quota_classes.py b/cinderclient/tests/v1/test_quota_classes.py similarity index 94% rename from tests/v1/test_quota_classes.py rename to cinderclient/tests/v1/test_quota_classes.py index 4d4cb585b..33b390df0 100644 --- a/tests/v1/test_quota_classes.py +++ b/cinderclient/tests/v1/test_quota_classes.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/v1/test_quotas.py b/cinderclient/tests/v1/test_quotas.py similarity index 95% rename from tests/v1/test_quotas.py rename to cinderclient/tests/v1/test_quotas.py index 7afc626c0..7ebb061fb 100644 --- a/tests/v1/test_quotas.py +++ b/cinderclient/tests/v1/test_quotas.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/v1/test_shell.py b/cinderclient/tests/v1/test_shell.py similarity index 98% rename from tests/v1/test_shell.py rename to cinderclient/tests/v1/test_shell.py index 8d283098e..9e8e2f7c0 100644 --- a/tests/v1/test_shell.py +++ b/cinderclient/tests/v1/test_shell.py @@ -22,8 +22,8 @@ import fixtures from cinderclient import client from cinderclient import shell from cinderclient.v1 import shell as shell_v1 -from tests.v1 import fakes -from tests import utils +from cinderclient.tests.v1 import fakes +from cinderclient.tests import utils class ShellTest(utils.TestCase): diff --git a/tests/v1/test_types.py b/cinderclient/tests/v1/test_types.py similarity index 92% rename from tests/v1/test_types.py rename to cinderclient/tests/v1/test_types.py index 92aa2c090..41a89b75a 100644 --- a/tests/v1/test_types.py +++ b/cinderclient/tests/v1/test_types.py @@ -1,7 +1,7 @@ from cinderclient import exceptions from cinderclient.v1 import volume_types -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/v1/test_volume_backups.py b/cinderclient/tests/v1/test_volume_backups.py similarity index 95% rename from tests/v1/test_volume_backups.py rename to cinderclient/tests/v1/test_volume_backups.py index 4c11fce03..dd7ec0dab 100644 --- a/tests/v1/test_volume_backups.py +++ b/cinderclient/tests/v1/test_volume_backups.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/v1/test_volumes.py b/cinderclient/tests/v1/test_volumes.py similarity index 96% rename from tests/v1/test_volumes.py rename to cinderclient/tests/v1/test_volumes.py index 3306fdbcf..16410c9d3 100644 --- a/tests/v1/test_volumes.py +++ b/cinderclient/tests/v1/test_volumes.py @@ -1,5 +1,5 @@ -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes cs = fakes.FakeClient() diff --git a/tests/v1/testfile.txt b/cinderclient/tests/v1/testfile.txt similarity index 100% rename from tests/v1/testfile.txt rename to cinderclient/tests/v1/testfile.txt diff --git a/tests/v2/__init__.py b/cinderclient/tests/v2/__init__.py similarity index 100% rename from tests/v2/__init__.py rename to cinderclient/tests/v2/__init__.py diff --git a/tests/v2/contrib/__init__.py b/cinderclient/tests/v2/contrib/__init__.py similarity index 100% rename from tests/v2/contrib/__init__.py rename to cinderclient/tests/v2/contrib/__init__.py diff --git a/tests/v2/contrib/test_list_extensions.py b/cinderclient/tests/v2/contrib/test_list_extensions.py similarity index 93% rename from tests/v2/contrib/test_list_extensions.py rename to cinderclient/tests/v2/contrib/test_list_extensions.py index 49b0e572e..ff59cd23c 100644 --- a/tests/v2/contrib/test_list_extensions.py +++ b/cinderclient/tests/v2/contrib/test_list_extensions.py @@ -16,8 +16,8 @@ from cinderclient import extension from cinderclient.v2.contrib import list_extensions -from tests import utils -from tests.v1 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v1 import fakes extensions = [ diff --git a/tests/v2/fakes.py b/cinderclient/tests/v2/fakes.py similarity index 99% rename from tests/v2/fakes.py rename to cinderclient/tests/v2/fakes.py index 8567591ad..f90ace363 100644 --- a/tests/v2/fakes.py +++ b/cinderclient/tests/v2/fakes.py @@ -15,9 +15,9 @@ import urlparse from cinderclient import client as base_client +from cinderclient.tests import fakes +import cinderclient.tests.utils as utils from cinderclient.v2 import client -from tests import fakes -import tests.utils as utils def _stub_volume(**kwargs): diff --git a/tests/v2/test_auth.py b/cinderclient/tests/v2/test_auth.py similarity index 99% rename from tests/v2/test_auth.py rename to cinderclient/tests/v2/test_auth.py index b29752a25..89dd18fcb 100644 --- a/tests/v2/test_auth.py +++ b/cinderclient/tests/v2/test_auth.py @@ -21,7 +21,7 @@ import requests from cinderclient import exceptions from cinderclient.v2 import client -from tests import utils +from cinderclient.tests import utils class AuthenticateAgainstKeystoneTests(utils.TestCase): diff --git a/tests/v2/test_quota_classes.py b/cinderclient/tests/v2/test_quota_classes.py similarity index 94% rename from tests/v2/test_quota_classes.py rename to cinderclient/tests/v2/test_quota_classes.py index 6be6cc0eb..ce7646c99 100644 --- a/tests/v2/test_quota_classes.py +++ b/cinderclient/tests/v2/test_quota_classes.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes cs = fakes.FakeClient() diff --git a/tests/v2/test_quotas.py b/cinderclient/tests/v2/test_quotas.py similarity index 95% rename from tests/v2/test_quotas.py rename to cinderclient/tests/v2/test_quotas.py index d222e8314..37ceeed7b 100644 --- a/tests/v2/test_quotas.py +++ b/cinderclient/tests/v2/test_quotas.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes cs = fakes.FakeClient() diff --git a/tests/v2/test_shell.py b/cinderclient/tests/v2/test_shell.py similarity index 98% rename from tests/v2/test_shell.py rename to cinderclient/tests/v2/test_shell.py index ce6646f83..8f6e0742c 100644 --- a/tests/v2/test_shell.py +++ b/cinderclient/tests/v2/test_shell.py @@ -17,8 +17,8 @@ import fixtures from cinderclient import client from cinderclient import shell -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes class ShellTest(utils.TestCase): diff --git a/tests/v2/test_types.py b/cinderclient/tests/v2/test_types.py similarity index 95% rename from tests/v2/test_types.py rename to cinderclient/tests/v2/test_types.py index f36b768b6..de8c743df 100644 --- a/tests/v2/test_types.py +++ b/cinderclient/tests/v2/test_types.py @@ -15,8 +15,8 @@ # under the License. from cinderclient.v2 import volume_types -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes cs = fakes.FakeClient() diff --git a/tests/v2/test_volume_backups.py b/cinderclient/tests/v2/test_volume_backups.py similarity index 95% rename from tests/v2/test_volume_backups.py rename to cinderclient/tests/v2/test_volume_backups.py index 083da3153..44b1c54e9 100644 --- a/tests/v2/test_volume_backups.py +++ b/cinderclient/tests/v2/test_volume_backups.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes cs = fakes.FakeClient() diff --git a/tests/v2/test_volumes.py b/cinderclient/tests/v2/test_volumes.py similarity index 97% rename from tests/v2/test_volumes.py rename to cinderclient/tests/v2/test_volumes.py index 8e46da6c0..a66dd8ce1 100644 --- a/tests/v2/test_volumes.py +++ b/cinderclient/tests/v2/test_volumes.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tests import utils -from tests.v2 import fakes +from cinderclient.tests import utils +from cinderclient.tests.v2 import fakes cs = fakes.FakeClient()