Move tests into manilaclient package

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

Also moved unit tests to dir 'unit', it is done so because 'functional' tests
are expected to be added.

Change-Id: I801214b865e9cef8db7511f209dcf3c26b75d70f

.testr.conf

@@ -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 ./ ./tests $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./manilaclient/tests/unit $LISTOPT $IDOPTION
 
 test_id_option=--load-list $IDFILE
-test_list_option=--list
+test_list_option=--list

manilaclient/tests/unit/test_base.py

@@ -12,9 +12,9 @@
 
 from manilaclient import exceptions
 from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import shares
-from tests import utils
-from tests.v1 import fakes
 
 
 cs = fakes.FakeClient()

manilaclient/tests/unit/test_client.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import manilaclient.client
+from manilaclient.tests.unit import utils
 import manilaclient.v1.client
-from tests import utils
 
 
 class ClientTest(utils.TestCase):

manilaclient/tests/unit/test_http.py

@@ -15,7 +15,7 @@ import requests
 
 from manilaclient import client
 from manilaclient import exceptions
-from tests import utils
+from manilaclient.tests.unit import utils
 
 
 fake_response = utils.TestResponse({

manilaclient/tests/unit/test_service_catalog.py

@@ -12,7 +12,7 @@
 
 from manilaclient import exceptions
 from manilaclient import service_catalog
-from tests import utils
+from manilaclient.tests.unit import utils
 
 
 # Taken directly from keystone/content/common/samples/auth.json

manilaclient/tests/unit/test_shell.py

@@ -18,8 +18,8 @@ from six import moves
 from testtools import matchers
 
 from manilaclient import exceptions
-import manilaclient.shell
-from tests import utils
+from manilaclient import shell
+from manilaclient.tests.unit import utils
 
 
 class ShellTest(utils.TestCase):
@@ -42,7 +42,7 @@ class ShellTest(utils.TestCase):
         orig = sys.stdout
         try:
             sys.stdout = moves.StringIO()
-            _shell = manilaclient.shell.OpenStackManilaShell()
+            _shell = shell.OpenStackManilaShell()
             _shell.main(argstr.split())
         except SystemExit:
             exc_type, exc_value, exc_traceback = sys.exc_info()

manilaclient/tests/unit/v1/fake_clients.py

@@ -18,9 +18,9 @@ except ImportError:
     import urllib.parse as urlparse
 
 from manilaclient import client as base_client
+from manilaclient.tests.unit import fakes
+from manilaclient.tests.unit import utils
 from manilaclient.v1 import client
-from tests import fakes
-import tests.utils as utils
 
 
 class FakeClient(fakes.FakeClient, client.Client):

manilaclient/tests/unit/v1/fakes.py

@@ -15,8 +15,8 @@
 
 from __future__ import print_function
 
+from manilaclient.tests.unit.v1 import fake_clients as fakes
 from manilaclient.v1 import client
-from tests.v1 import fake_clients as fakes
 
 
 class FakeClient(fakes.FakeClient):

manilaclient/tests/unit/v1/test_auth.py

@@ -20,8 +20,8 @@ import mock
 import requests
 
 from manilaclient import exceptions
+from manilaclient.tests.unit import utils
 from manilaclient.v1 import client
-from tests import utils
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):

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

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

manilaclient/tests/unit/v1/test_security_services.py

@@ -15,9 +15,9 @@
 import mock
 
 from manilaclient import exceptions
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import security_services
-from tests import utils
-from tests.v1 import fakes
 
 
 class SecurityServiceTest(utils.TestCase):

manilaclient/tests/unit/v1/test_services.py

@@ -15,8 +15,8 @@
 
 import mock
 
+from manilaclient.tests.unit import utils
 from manilaclient.v1 import services
-from tests import utils
 
 
 class ServicesTest(utils.TestCase):

manilaclient/tests/unit/v1/test_share_networks.py

@@ -15,9 +15,9 @@
 import mock
 
 from manilaclient import exceptions
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import share_networks
-from tests import utils
-from tests.v1 import fakes
 
 
 class ShareNetworkTest(utils.TestCase):

manilaclient/tests/unit/v1/test_share_servers.py

@@ -15,8 +15,8 @@
 
 import mock
 
+from manilaclient.tests.unit import utils
 from manilaclient.v1 import share_servers
-from tests import utils
 
 
 class FakeShareServer(object):

manilaclient/tests/unit/v1/test_share_snapshots.py

@@ -16,9 +16,9 @@
 #    under the License.
 
 from manilaclient import extension
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import share_snapshots
-from tests import utils
-from tests.v1 import fakes
 
 
 extensions = [

manilaclient/tests/unit/v1/test_shares.py

@@ -19,9 +19,9 @@ import mock
 
 from manilaclient import exceptions
 from manilaclient import extension
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import shares
-from tests import utils
-from tests.v1 import fakes
 
 
 extensions = [

manilaclient/tests/unit/v1/test_shell.py

@@ -25,11 +25,11 @@ from manilaclient import exceptions
 from manilaclient.openstack.common import cliutils
 from manilaclient.openstack.common import jsonutils
 from manilaclient import shell
+from manilaclient.tests.unit import utils as test_utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient import utils
 from manilaclient.v1 import client as client_v1
 from manilaclient.v1 import shell as shell_v1
-from tests import utils as test_utils
-from tests.v1 import fakes
 
 
 class ShellTest(test_utils.TestCase):

manilaclient/tests/unit/v1/test_types.py

@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from manilaclient.tests.unit import utils
+from manilaclient.tests.unit.v1 import fakes
 from manilaclient.v1 import volume_types
-from tests import utils
-from tests.v1 import fakes
 
 cs = fakes.FakeClient()
 

tests/old/contrib/__init__.py

@@ -1 +0,0 @@
-__author__ = 'vkostenko'