move unit tests to new "unit" test module

this will better isolate the unit tests from the functional tests.
unfortunately, the "integration" tests had to be lumped into the
"unit" tests since we need the separation in testr.conf

Change-Id: Ifd12198c1f90e4e3c951c73bfa1884ab300d8ded

Author: stevemar

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

openstackclient/tests/api/__init__.py openstackclient/tests/unit/__init__.pyopenstackclient/tests/api/__init__.py renamed to openstackclient/tests/unit/__init__.py

@@ -16,7 +16,7 @@
 from keystoneauth1 import session
 from requests_mock.contrib import fixture
 
-from openstackclient.tests import utils
+from openstackclient.tests.unit import utils
 
 
 RESP_ITEM_1 = {

openstackclient/tests/common/__init__.py …enstackclient/tests/unit/api/__init__.pyopenstackclient/tests/common/__init__.py renamed to openstackclient/tests/unit/api/__init__.py openstackclient/tests/common/__init__.py renamed to openstackclient/tests/unit/api/__init__.py

@@ -16,7 +16,7 @@
 from osc_lib import exceptions
 
 from openstackclient.api import api
-from openstackclient.tests.api import fakes as api_fakes
+from openstackclient.tests.unit.api import fakes as api_fakes
 
 
 class TestKeystoneSession(api_fakes.TestSession):

openstackclient/tests/api/fakes.py openstackclient/tests/unit/api/fakes.pyopenstackclient/tests/api/fakes.py renamed to openstackclient/tests/unit/api/fakes.py

@@ -17,7 +17,7 @@
 from requests_mock.contrib import fixture
 
 from openstackclient.api import image_v1
-from openstackclient.tests import utils
+from openstackclient.tests.unit import utils
 
 
 FAKE_PROJECT = 'xyzpdq'

openstackclient/tests/api/test_api.py …enstackclient/tests/unit/api/test_api.pyopenstackclient/tests/api/test_api.py renamed to openstackclient/tests/unit/api/test_api.py openstackclient/tests/api/test_api.py renamed to openstackclient/tests/unit/api/test_api.py

@@ -17,7 +17,7 @@
 from requests_mock.contrib import fixture
 
 from openstackclient.api import image_v2
-from openstackclient.tests import utils
+from openstackclient.tests.unit import utils
 
 
 FAKE_PROJECT = 'xyzpdq'

…enstackclient/tests/api/test_image_v1.py …ckclient/tests/unit/api/test_image_v1.pyopenstackclient/tests/api/test_image_v1.py renamed to openstackclient/tests/unit/api/test_image_v1.py openstackclient/tests/api/test_image_v1.py renamed to openstackclient/tests/unit/api/test_image_v1.py

@@ -19,7 +19,7 @@
 from requests_mock.contrib import fixture
 
 from openstackclient.api import object_store_v1 as object_store
-from openstackclient.tests import utils
+from openstackclient.tests.unit import utils
 
 
 FAKE_ACCOUNT = 'q12we34r'

…enstackclient/tests/api/test_image_v2.py …ckclient/tests/unit/api/test_image_v2.pyopenstackclient/tests/api/test_image_v2.py renamed to openstackclient/tests/unit/api/test_image_v2.py openstackclient/tests/api/test_image_v2.py renamed to openstackclient/tests/unit/api/test_image_v2.py

@@ -17,7 +17,7 @@
 
 from openstackclient.api import api
 from openstackclient.api import utils as api_utils
-from openstackclient.tests.api import fakes as api_fakes
+from openstackclient.tests.unit.api import fakes as api_fakes
 
 
 class TestBaseAPIFilter(api_fakes.TestSession):