Merge "Move tests into project package."

.testr.conf

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

openstackclient/tests/common/test_clientmanager.py

@@ -14,7 +14,7 @@
 #
 
 from openstackclient.common import clientmanager
-from tests import utils
+from openstackclient.tests import utils
 
 
 class Container(object):

openstackclient/tests/common/test_commandmanager.py

@@ -16,7 +16,7 @@
 import mock
 
 from openstackclient.common import commandmanager
-from tests import utils
+from openstackclient.tests import utils
 
 
 class FakeCommand(object):

openstackclient/tests/common/test_parseractions.py

@@ -16,7 +16,7 @@
 import argparse
 
 from openstackclient.common import parseractions
-from tests import utils
+from openstackclient.tests import utils
 
 
 class TestKeyValueAction(utils.TestCase):

openstackclient/tests/compute/test_compute.py

@@ -17,7 +17,7 @@ import mock
 
 from openstackclient.common import clientmanager
 from openstackclient.compute import client as compute_client
-from tests import utils
+from openstackclient.tests import utils
 
 
 AUTH_TOKEN = "foobar"
@@ -37,7 +37,7 @@ class TestCompute(utils.TestCase):
         api_version = {"compute": "2"}
 
         compute_client.API_VERSIONS = {
-            "2": "tests.compute.test_compute.FakeClient"
+            "2": "openstackclient.tests.compute.test_compute.FakeClient"
         }
 
         self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,

openstackclient/tests/identity/test_identity.py

@@ -15,7 +15,7 @@
 
 from openstackclient.common import clientmanager
 from openstackclient.identity import client as identity_client
-from tests import utils
+from openstackclient.tests import utils
 
 
 AUTH_TOKEN = "foobar"
@@ -35,7 +35,7 @@ class TestIdentity(utils.TestCase):
         api_version = {"identity": "2.0"}
 
         identity_client.API_VERSIONS = {
-            "2.0": "tests.identity.test_identity.FakeClient"
+            "2.0": "openstackclient.tests.identity.test_identity.FakeClient"
         }
 
         self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,

openstackclient/tests/image/test_image.py

@@ -17,7 +17,7 @@ import mock
 
 from openstackclient.common import clientmanager
 from openstackclient.image import client as image_client
-from tests import utils
+from openstackclient.tests import utils
 
 
 AUTH_TOKEN = "foobar"
@@ -38,7 +38,7 @@ class TestImage(utils.TestCase):
         api_version = {"image": "2"}
 
         image_client.API_VERSIONS = {
-            "2": "tests.image.test_image.FakeClient"
+            "2": "openstackclient.tests.image.test_image.FakeClient"
         }
 
         self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,

openstackclient/tests/test_shell.py

@@ -17,7 +17,7 @@ import mock
 import os
 
 from openstackclient import shell
-from tests import utils
+from openstackclient.tests import utils
 
 
 DEFAULT_USERNAME = "username"

openstackclient/tests/volume/test_volume.py

@@ -16,8 +16,8 @@
 import mock
 
 from openstackclient.common import clientmanager
+from openstackclient.tests import utils
 from openstackclient.volume import client as volume_client
-from tests import utils
 
 
 AUTH_TOKEN = "foobar"
@@ -38,7 +38,7 @@ class TestVolume(utils.TestCase):
         api_version = {"volume": "1"}
 
         volume_client.API_VERSIONS = {
-            "1": "tests.volume.test_volume.FakeClient"
+            "1": "openstackclient.tests.volume.test_volume.FakeClient"
         }
 
         self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,