Merge "Move unit tests into their own subdirectory"

28 files changed, 24 insertions, 24 deletions

diff --git a/.testr.conf b/.testr.conf
index 818fbc3..77a2a70 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 ./ ./ $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./ceilometerclient/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/ceilometerclient/tests/v1/__init__.py b/ceilometerclient/tests/unit/__init__.py
index e69de29..e69de29 100644
--- a/ceilometerclient/tests/v1/__init__.py
+++ b/ceilometerclient/tests/unit/__init__.py
diff --git a/ceilometerclient/tests/fakes.py b/ceilometerclient/tests/unit/fakes.py
index 10d8d8c..10d8d8c 100644
--- a/ceilometerclient/tests/fakes.py
+++ b/ceilometerclient/tests/unit/fakes.py
diff --git a/ceilometerclient/tests/test_client.py b/ceilometerclient/tests/unit/test_client.py
index 45472a4..d582d93 100644
--- a/ceilometerclient/tests/test_client.py
+++ b/ceilometerclient/tests/unit/test_client.py
@@ -15,8 +15,8 @@ import types
 import mock
 
 from ceilometerclient import client
-from ceilometerclient.tests import fakes
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import fakes
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v1 import client as v1client
 from ceilometerclient.v2 import client as v2client
 
diff --git a/ceilometerclient/tests/test_exc.py b/ceilometerclient/tests/unit/test_exc.py
index 9c8f146..db8df32 100644
--- a/ceilometerclient/tests/test_exc.py
+++ b/ceilometerclient/tests/unit/test_exc.py
@@ -16,7 +16,7 @@
 import json
 
 from ceilometerclient import exc
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 
 HTTPEXCEPTIONS = {'HTTPBadRequest': exc.HTTPBadRequest,
                   'HTTPUnauthorized': exc.HTTPUnauthorized,
diff --git a/ceilometerclient/tests/test_shell.py b/ceilometerclient/tests/unit/test_shell.py
index 6d6403b..7d06ab7 100644
--- a/ceilometerclient/tests/test_shell.py
+++ b/ceilometerclient/tests/unit/test_shell.py
@@ -22,7 +22,7 @@ from testtools import matchers
 from ceilometerclient import exc
 from ceilometerclient.openstack.common.apiclient import client as api_client
 from ceilometerclient import shell as ceilometer_shell
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import client as v2client
 
 FAKE_V2_ENV = {'OS_USERNAME': 'username',
diff --git a/ceilometerclient/tests/test_utils.py b/ceilometerclient/tests/unit/test_utils.py
index 23235d3..00bd416 100644
--- a/ceilometerclient/tests/test_utils.py
+++ b/ceilometerclient/tests/unit/test_utils.py
@@ -19,7 +19,7 @@ import mock
 import six
 
 from ceilometerclient.common import utils
-from ceilometerclient.tests import utils as test_utils
+from ceilometerclient.tests.unit import utils as test_utils
 
 
 class UtilsTest(test_utils.BaseTestCase):
diff --git a/ceilometerclient/tests/utils.py b/ceilometerclient/tests/unit/utils.py
index 57bc276..57bc276 100644
--- a/ceilometerclient/tests/utils.py
+++ b/ceilometerclient/tests/unit/utils.py
diff --git a/ceilometerclient/tests/v2/__init__.py b/ceilometerclient/tests/unit/v1/__init__.py
index e69de29..e69de29 100644
--- a/ceilometerclient/tests/v2/__init__.py
+++ b/ceilometerclient/tests/unit/v1/__init__.py
diff --git a/ceilometerclient/tests/v1/test_meters.py b/ceilometerclient/tests/unit/v1/test_meters.py
index 1c883b7..afd9a1b 100644
--- a/ceilometerclient/tests/v1/test_meters.py
+++ b/ceilometerclient/tests/unit/v1/test_meters.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v1.meters
 
 
diff --git a/ceilometerclient/tests/v1/test_projects.py b/ceilometerclient/tests/unit/v1/test_projects.py
index 2f34a5c..7b31bce 100644
--- a/ceilometerclient/tests/v1/test_projects.py
+++ b/ceilometerclient/tests/unit/v1/test_projects.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v1.meters
 
 
diff --git a/ceilometerclient/tests/v1/test_resources.py b/ceilometerclient/tests/unit/v1/test_resources.py
index 4eac3fe..cfc4f6c 100644
--- a/ceilometerclient/tests/v1/test_resources.py
+++ b/ceilometerclient/tests/unit/v1/test_resources.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v1.meters
 
 
diff --git a/ceilometerclient/tests/v1/test_samples.py b/ceilometerclient/tests/unit/v1/test_samples.py
index 61f064e..0f1a029 100644
--- a/ceilometerclient/tests/v1/test_samples.py
+++ b/ceilometerclient/tests/unit/v1/test_samples.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v1.meters
 
 
diff --git a/ceilometerclient/tests/v1/test_users.py b/ceilometerclient/tests/unit/v1/test_users.py
index 541139b..e8e98a1 100644
--- a/ceilometerclient/tests/v1/test_users.py
+++ b/ceilometerclient/tests/unit/v1/test_users.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v1.meters
 
 
diff --git a/ceilometerclient/tests/unit/v2/__init__.py b/ceilometerclient/tests/unit/v2/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ceilometerclient/tests/unit/v2/__init__.py
diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/unit/v2/test_alarms.py
index 4239d2f..4239d2f 100644
--- a/ceilometerclient/tests/v2/test_alarms.py
+++ b/ceilometerclient/tests/unit/v2/test_alarms.py
diff --git a/ceilometerclient/tests/v2/test_event_types.py b/ceilometerclient/tests/unit/v2/test_event_types.py
index 8d5e4a0..7dc1508 100644
--- a/ceilometerclient/tests/v2/test_event_types.py
+++ b/ceilometerclient/tests/unit/v2/test_event_types.py
@@ -15,7 +15,7 @@
 
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.event_types
 
 
diff --git a/ceilometerclient/tests/v2/test_events.py b/ceilometerclient/tests/unit/v2/test_events.py
index 6b1e74b..6cb1c1e 100644
--- a/ceilometerclient/tests/v2/test_events.py
+++ b/ceilometerclient/tests/unit/v2/test_events.py
@@ -13,7 +13,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.events
 
 
diff --git a/ceilometerclient/tests/v2/test_options.py b/ceilometerclient/tests/unit/v2/test_options.py
index 6318d5c..1a9ec24 100644
--- a/ceilometerclient/tests/v2/test_options.py
+++ b/ceilometerclient/tests/unit/v2/test_options.py
@@ -10,7 +10,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import options
 
 
diff --git a/ceilometerclient/tests/v2/test_query_alarm_history.py b/ceilometerclient/tests/unit/v2/test_query_alarm_history.py
index 60d437d..014b894 100644
--- a/ceilometerclient/tests/v2/test_query_alarm_history.py
+++ b/ceilometerclient/tests/unit/v2/test_query_alarm_history.py
@@ -16,7 +16,7 @@
 
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import query
 
 
diff --git a/ceilometerclient/tests/v2/test_query_alarms.py b/ceilometerclient/tests/unit/v2/test_query_alarms.py
index 7897ad1..e633938 100644
--- a/ceilometerclient/tests/v2/test_query_alarms.py
+++ b/ceilometerclient/tests/unit/v2/test_query_alarms.py
@@ -14,7 +14,7 @@
 
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import query
 
 
diff --git a/ceilometerclient/tests/v2/test_query_samples.py b/ceilometerclient/tests/unit/v2/test_query_samples.py
index e747717..16828fe 100644
--- a/ceilometerclient/tests/v2/test_query_samples.py
+++ b/ceilometerclient/tests/unit/v2/test_query_samples.py
@@ -14,7 +14,7 @@
 
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import query
 
 
diff --git a/ceilometerclient/tests/v2/test_resources.py b/ceilometerclient/tests/unit/v2/test_resources.py
index 090ce8c..4aa9131 100644
--- a/ceilometerclient/tests/v2/test_resources.py
+++ b/ceilometerclient/tests/unit/v2/test_resources.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.resources
 
 
diff --git a/ceilometerclient/tests/v2/test_samples.py b/ceilometerclient/tests/unit/v2/test_samples.py
index aee2220..1d42fb4 100644
--- a/ceilometerclient/tests/v2/test_samples.py
+++ b/ceilometerclient/tests/unit/v2/test_samples.py
@@ -17,7 +17,7 @@ import copy
 
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.samples
 
 GET_OLD_SAMPLE = {u'counter_name': u'instance',
diff --git a/ceilometerclient/tests/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py
index 921bded..a4b9f33 100644
--- a/ceilometerclient/tests/v2/test_shell.py
+++ b/ceilometerclient/tests/unit/v2/test_shell.py
@@ -24,8 +24,8 @@ from testtools import matchers
 
 from ceilometerclient import exc
 from ceilometerclient import shell as base_shell
-from ceilometerclient.tests import test_shell
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import test_shell
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import alarms
 from ceilometerclient.v2 import events
 from ceilometerclient.v2 import samples
diff --git a/ceilometerclient/tests/v2/test_statistics.py b/ceilometerclient/tests/unit/v2/test_statistics.py
index 65f633e..d2f7aee 100644
--- a/ceilometerclient/tests/v2/test_statistics.py
+++ b/ceilometerclient/tests/unit/v2/test_statistics.py
@@ -14,7 +14,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.statistics
 
 base_url = '/v2/meters/instance/statistics'
diff --git a/ceilometerclient/tests/v2/test_trait_descriptions.py b/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
index 7913124..abe8288 100644
--- a/ceilometerclient/tests/v2/test_trait_descriptions.py
+++ b/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
@@ -13,7 +13,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.trait_descriptions
 
 
diff --git a/ceilometerclient/tests/v2/test_traits.py b/ceilometerclient/tests/unit/v2/test_traits.py
index 1d7dde0..7b44a69 100644
--- a/ceilometerclient/tests/v2/test_traits.py
+++ b/ceilometerclient/tests/unit/v2/test_traits.py
@@ -13,7 +13,7 @@
 #    under the License.
 from ceilometerclient.openstack.common.apiclient import client
 from ceilometerclient.openstack.common.apiclient import fake_client
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 import ceilometerclient.v2.traits