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
This commit is contained in:
parent
e727d22bf1
commit
d9d8cc614e
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
@ -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,
|
|
@ -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',
|
|
@ -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):
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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',
|
|
@ -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
|
|
@ -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'
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue