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

@@ -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

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.unit import fakes
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v1 import client as v1client
 from ceilometerclient.v2 import client as v2client
 

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,

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',

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

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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',

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.unit import test_shell
-from ceilometerclient.tests import utils
+from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import alarms
 from ceilometerclient.v2 import events
 from ceilometerclient.v2 import samples

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'

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
 
 

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