Move tests into cinderclient package.

tests/__init__.py implies a package in the global namespace called
tests. That's not what these are - they're tests in the cinderclient
namespace.

Change-Id: I29c95bcd8747c3f5f21d5d900879c9b6b1c9a963

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

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):

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({

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

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):

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'
 

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 extensions = [

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):

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):

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests.v1 import fakes
-from tests import utils
+from cinderclient.tests import utils
 
 
 class ShellTest(utils.TestCase):

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 cs = fakes.FakeClient()
 

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

cinderclient/tests/v1/test_volumes.py

@@ -1,5 +1,5 @@
-from tests import utils
+from cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests import utils
-from tests.v1 import fakes
+from cinderclient.tests.v1 import fakes
 
 
 extensions = [

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):

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):

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 cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 class ShellTest(utils.TestCase):

cinderclient/tests/v2/test_types.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from cinderclient.v2 import volume_types
-from tests import utils
+from cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 cs = fakes.FakeClient()
 

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 cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()

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 cinderclient.tests import utils
-from tests.v2 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()