From d9d8cc614eccaffefdfd4aa4f536745f0aabc5e3 Mon Sep 17 00:00:00 2001
From: Chris Dent <chdent@redhat.com>
Date: Thu, 12 Mar 2015 13:31:06 +0000
Subject: [PATCH] Move unit tests into their own subdirectory

This is in preparation of moving functional tests currently in
tempest in-tree.

No surprises in this change:

* move files
* update the local imports

Same number of tests run, all still pass.

Change-Id: Ibfeac44421c5f36740b1377868f5ec469b2893f5
---
 .testr.conf                                                   | 2 +-
 ceilometerclient/tests/{v1 => unit}/__init__.py               | 0
 ceilometerclient/tests/{ => unit}/fakes.py                    | 0
 ceilometerclient/tests/{ => unit}/test_client.py              | 4 ++--
 ceilometerclient/tests/{ => unit}/test_exc.py                 | 2 +-
 ceilometerclient/tests/{ => unit}/test_shell.py               | 2 +-
 ceilometerclient/tests/{ => unit}/test_utils.py               | 2 +-
 ceilometerclient/tests/{ => unit}/utils.py                    | 0
 ceilometerclient/tests/{v2 => unit/v1}/__init__.py            | 0
 ceilometerclient/tests/{ => unit}/v1/test_meters.py           | 2 +-
 ceilometerclient/tests/{ => unit}/v1/test_projects.py         | 2 +-
 ceilometerclient/tests/{ => unit}/v1/test_resources.py        | 2 +-
 ceilometerclient/tests/{ => unit}/v1/test_samples.py          | 2 +-
 ceilometerclient/tests/{ => unit}/v1/test_users.py            | 2 +-
 ceilometerclient/tests/unit/v2/__init__.py                    | 0
 ceilometerclient/tests/{ => unit}/v2/test_alarms.py           | 0
 ceilometerclient/tests/{ => unit}/v2/test_event_types.py      | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_events.py           | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_options.py          | 2 +-
 .../tests/{ => unit}/v2/test_query_alarm_history.py           | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_query_alarms.py     | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_query_samples.py    | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_resources.py        | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_samples.py          | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_shell.py            | 4 ++--
 ceilometerclient/tests/{ => unit}/v2/test_statistics.py       | 2 +-
 .../tests/{ => unit}/v2/test_trait_descriptions.py            | 2 +-
 ceilometerclient/tests/{ => unit}/v2/test_traits.py           | 2 +-
 28 files changed, 24 insertions(+), 24 deletions(-)
 rename ceilometerclient/tests/{v1 => unit}/__init__.py (100%)
 rename ceilometerclient/tests/{ => unit}/fakes.py (100%)
 rename ceilometerclient/tests/{ => unit}/test_client.py (98%)
 rename ceilometerclient/tests/{ => unit}/test_exc.py (98%)
 rename ceilometerclient/tests/{ => unit}/test_shell.py (99%)
 rename ceilometerclient/tests/{ => unit}/test_utils.py (99%)
 rename ceilometerclient/tests/{ => unit}/utils.py (100%)
 rename ceilometerclient/tests/{v2 => unit/v1}/__init__.py (100%)
 rename ceilometerclient/tests/{ => unit}/v1/test_meters.py (99%)
 rename ceilometerclient/tests/{ => unit}/v1/test_projects.py (97%)
 rename ceilometerclient/tests/{ => unit}/v1/test_resources.py (99%)
 rename ceilometerclient/tests/{ => unit}/v1/test_samples.py (99%)
 rename ceilometerclient/tests/{ => unit}/v1/test_users.py (97%)
 create mode 100644 ceilometerclient/tests/unit/v2/__init__.py
 rename ceilometerclient/tests/{ => unit}/v2/test_alarms.py (100%)
 rename ceilometerclient/tests/{ => unit}/v2/test_event_types.py (97%)
 rename ceilometerclient/tests/{ => unit}/v2/test_events.py (99%)
 rename ceilometerclient/tests/{ => unit}/v2/test_options.py (99%)
 rename ceilometerclient/tests/{ => unit}/v2/test_query_alarm_history.py (98%)
 rename ceilometerclient/tests/{ => unit}/v2/test_query_alarms.py (98%)
 rename ceilometerclient/tests/{ => unit}/v2/test_query_samples.py (98%)
 rename ceilometerclient/tests/{ => unit}/v2/test_resources.py (98%)
 rename ceilometerclient/tests/{ => unit}/v2/test_samples.py (99%)
 rename ceilometerclient/tests/{ => unit}/v2/test_shell.py (99%)
 rename ceilometerclient/tests/{ => unit}/v2/test_statistics.py (99%)
 rename ceilometerclient/tests/{ => unit}/v2/test_trait_descriptions.py (97%)
 rename ceilometerclient/tests/{ => unit}/v2/test_traits.py (98%)

diff --git a/.testr.conf b/.testr.conf
index 818fbc31..77a2a70e 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
similarity index 100%
rename from ceilometerclient/tests/v1/__init__.py
rename to ceilometerclient/tests/unit/__init__.py
diff --git a/ceilometerclient/tests/fakes.py b/ceilometerclient/tests/unit/fakes.py
similarity index 100%
rename from ceilometerclient/tests/fakes.py
rename to ceilometerclient/tests/unit/fakes.py
diff --git a/ceilometerclient/tests/test_client.py b/ceilometerclient/tests/unit/test_client.py
similarity index 98%
rename from ceilometerclient/tests/test_client.py
rename to ceilometerclient/tests/unit/test_client.py
index 45472a44..d582d93a 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
similarity index 98%
rename from ceilometerclient/tests/test_exc.py
rename to ceilometerclient/tests/unit/test_exc.py
index 9c8f1467..db8df326 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
similarity index 99%
rename from ceilometerclient/tests/test_shell.py
rename to ceilometerclient/tests/unit/test_shell.py
index 6d6403bb..7d06ab7c 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
similarity index 99%
rename from ceilometerclient/tests/test_utils.py
rename to ceilometerclient/tests/unit/test_utils.py
index 23235d30..00bd416b 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
similarity index 100%
rename from ceilometerclient/tests/utils.py
rename to ceilometerclient/tests/unit/utils.py
diff --git a/ceilometerclient/tests/v2/__init__.py b/ceilometerclient/tests/unit/v1/__init__.py
similarity index 100%
rename from ceilometerclient/tests/v2/__init__.py
rename to ceilometerclient/tests/unit/v1/__init__.py
diff --git a/ceilometerclient/tests/v1/test_meters.py b/ceilometerclient/tests/unit/v1/test_meters.py
similarity index 99%
rename from ceilometerclient/tests/v1/test_meters.py
rename to ceilometerclient/tests/unit/v1/test_meters.py
index 1c883b7b..afd9a1bf 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
similarity index 97%
rename from ceilometerclient/tests/v1/test_projects.py
rename to ceilometerclient/tests/unit/v1/test_projects.py
index 2f34a5cb..7b31bce4 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
similarity index 99%
rename from ceilometerclient/tests/v1/test_resources.py
rename to ceilometerclient/tests/unit/v1/test_resources.py
index 4eac3fe8..cfc4f6c0 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
similarity index 99%
rename from ceilometerclient/tests/v1/test_samples.py
rename to ceilometerclient/tests/unit/v1/test_samples.py
index 61f064e4..0f1a029b 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
similarity index 97%
rename from ceilometerclient/tests/v1/test_users.py
rename to ceilometerclient/tests/unit/v1/test_users.py
index 541139bb..e8e98a12 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 00000000..e69de29b
diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/unit/v2/test_alarms.py
similarity index 100%
rename from ceilometerclient/tests/v2/test_alarms.py
rename to 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
similarity index 97%
rename from ceilometerclient/tests/v2/test_event_types.py
rename to ceilometerclient/tests/unit/v2/test_event_types.py
index 8d5e4a0b..7dc1508a 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
similarity index 99%
rename from ceilometerclient/tests/v2/test_events.py
rename to ceilometerclient/tests/unit/v2/test_events.py
index 6b1e74b4..6cb1c1ea 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
similarity index 99%
rename from ceilometerclient/tests/v2/test_options.py
rename to ceilometerclient/tests/unit/v2/test_options.py
index 6318d5ce..1a9ec244 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
similarity index 98%
rename from ceilometerclient/tests/v2/test_query_alarm_history.py
rename to ceilometerclient/tests/unit/v2/test_query_alarm_history.py
index 60d437d4..014b894d 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
similarity index 98%
rename from ceilometerclient/tests/v2/test_query_alarms.py
rename to ceilometerclient/tests/unit/v2/test_query_alarms.py
index 7897ad11..e6339380 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
similarity index 98%
rename from ceilometerclient/tests/v2/test_query_samples.py
rename to ceilometerclient/tests/unit/v2/test_query_samples.py
index e7477172..16828fef 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
similarity index 98%
rename from ceilometerclient/tests/v2/test_resources.py
rename to ceilometerclient/tests/unit/v2/test_resources.py
index 090ce8cd..4aa91316 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
similarity index 99%
rename from ceilometerclient/tests/v2/test_samples.py
rename to ceilometerclient/tests/unit/v2/test_samples.py
index aee22202..1d42fb45 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
similarity index 99%
rename from ceilometerclient/tests/v2/test_shell.py
rename to ceilometerclient/tests/unit/v2/test_shell.py
index 921bdedb..a4b9f339 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
similarity index 99%
rename from ceilometerclient/tests/v2/test_statistics.py
rename to ceilometerclient/tests/unit/v2/test_statistics.py
index 65f633e7..d2f7aeed 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
similarity index 97%
rename from ceilometerclient/tests/v2/test_trait_descriptions.py
rename to ceilometerclient/tests/unit/v2/test_trait_descriptions.py
index 7913124f..abe82883 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
similarity index 98%
rename from ceilometerclient/tests/v2/test_traits.py
rename to ceilometerclient/tests/unit/v2/test_traits.py
index 1d7dde08..7b44a69b 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