diff --git a/.testr.conf b/.testr.conf index 081907d599..0c6e4445fd 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION +test_command=${PYTHON:-python} -m subunit.run discover ceilometer $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/tests/agentbase.py b/ceilometer/tests/agentbase.py similarity index 100% rename from tests/agentbase.py rename to ceilometer/tests/agentbase.py diff --git a/tests/__init__.py b/ceilometer/tests/alarm/__init__.py similarity index 100% rename from tests/__init__.py rename to ceilometer/tests/alarm/__init__.py diff --git a/tests/alarm/__init__.py b/ceilometer/tests/alarm/evaluator/__init__.py similarity index 100% rename from tests/alarm/__init__.py rename to ceilometer/tests/alarm/evaluator/__init__.py diff --git a/tests/alarm/evaluator/base.py b/ceilometer/tests/alarm/evaluator/base.py similarity index 100% rename from tests/alarm/evaluator/base.py rename to ceilometer/tests/alarm/evaluator/base.py diff --git a/tests/alarm/evaluator/test_base.py b/ceilometer/tests/alarm/evaluator/test_base.py similarity index 100% rename from tests/alarm/evaluator/test_base.py rename to ceilometer/tests/alarm/evaluator/test_base.py diff --git a/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/alarm/evaluator/test_combination.py similarity index 99% rename from tests/alarm/evaluator/test_combination.py rename to ceilometer/tests/alarm/evaluator/test_combination.py index 633266a9a6..d1492f39f9 100644 --- a/tests/alarm/evaluator/test_combination.py +++ b/ceilometer/tests/alarm/evaluator/test_combination.py @@ -22,11 +22,10 @@ import uuid from ceilometer.alarm.evaluator import combination from ceilometer.storage import models +from ceilometer.tests.alarm.evaluator import base from ceilometerclient import exc from ceilometerclient.v2 import alarms -from tests.alarm.evaluator import base - class TestEvaluate(base.TestEvaluatorBase): EVALUATOR = combination.CombinationEvaluator diff --git a/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py similarity index 99% rename from tests/alarm/evaluator/test_threshold.py rename to ceilometer/tests/alarm/evaluator/test_threshold.py index 196b1107ff..15881d5400 100644 --- a/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/alarm/evaluator/test_threshold.py @@ -24,9 +24,9 @@ import uuid from ceilometer.alarm.evaluator import threshold from ceilometer.openstack.common import timeutils from ceilometer.storage import models +from ceilometer.tests.alarm.evaluator import base from ceilometerclient import exc from ceilometerclient.v2 import statistics -from tests.alarm.evaluator import base class TestEvaluate(base.TestEvaluatorBase): diff --git a/tests/alarm/evaluator/__init__.py b/ceilometer/tests/alarm/partition/__init__.py similarity index 100% rename from tests/alarm/evaluator/__init__.py rename to ceilometer/tests/alarm/partition/__init__.py diff --git a/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py similarity index 100% rename from tests/alarm/partition/test_coordination.py rename to ceilometer/tests/alarm/partition/test_coordination.py diff --git a/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py similarity index 100% rename from tests/alarm/test_notifier.py rename to ceilometer/tests/alarm/test_notifier.py diff --git a/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py similarity index 100% rename from tests/alarm/test_partitioned_alarm_svc.py rename to ceilometer/tests/alarm/test_partitioned_alarm_svc.py diff --git a/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py similarity index 100% rename from tests/alarm/test_rpc.py rename to ceilometer/tests/alarm/test_rpc.py diff --git a/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py similarity index 100% rename from tests/alarm/test_singleton_alarm_svc.py rename to ceilometer/tests/alarm/test_singleton_alarm_svc.py diff --git a/ceilometer/tests/api.py b/ceilometer/tests/api/__init__.py similarity index 97% rename from ceilometer/tests/api.py rename to ceilometer/tests/api/__init__.py index 920d09a112..c117db2e4b 100644 --- a/ceilometer/tests/api.py +++ b/ceilometer/tests/api/__init__.py @@ -42,8 +42,8 @@ class TestBase(db_test_base.TestBase): self.CONF.set_override("auth_version", "v2.0", group=acl.OPT_GROUP_NAME) self.CONF.set_override("policy_file", - self.path_get('tests/policy.json')) - sources_file = self.path_get('tests/sources.json') + self.path_get('etc/ceilometer/policy.json')) + sources_file = self.path_get('ceilometer/tests/sources.json') self.app = v1_app.make_app(self.CONF, enable_acl=False, attach_storage=False, @@ -83,14 +83,12 @@ class FunctionalTest(db_test_base.TestBase): PATH_PREFIX = '' - SOURCE_DATA = {'test_source': {'somekey': '666'}} - def setUp(self): super(FunctionalTest, self).setUp() self.CONF.set_override("auth_version", "v2.0", group=acl.OPT_GROUP_NAME) self.CONF.set_override("policy_file", - self.path_get('tests/policy.json')) + self.path_get('etc/ceilometer/policy.json')) self.app = self._make_app() def _make_app(self, enable_acl=False): diff --git a/tests/alarm/partition/__init__.py b/ceilometer/tests/api/v1/__init__.py similarity index 100% rename from tests/alarm/partition/__init__.py rename to ceilometer/tests/api/v1/__init__.py diff --git a/tests/api/v1/test_app.py b/ceilometer/tests/api/v1/test_app.py similarity index 100% rename from tests/api/v1/test_app.py rename to ceilometer/tests/api/v1/test_app.py diff --git a/tests/api/v1/test_compute_duration_by_resource_scenarios.py b/ceilometer/tests/api/v1/test_compute_duration_by_resource_scenarios.py similarity index 100% rename from tests/api/v1/test_compute_duration_by_resource_scenarios.py rename to ceilometer/tests/api/v1/test_compute_duration_by_resource_scenarios.py diff --git a/tests/api/v1/test_get_query_ts.py b/ceilometer/tests/api/v1/test_get_query_ts.py similarity index 100% rename from tests/api/v1/test_get_query_ts.py rename to ceilometer/tests/api/v1/test_get_query_ts.py diff --git a/tests/api/v1/test_list_events_scenarios.py b/ceilometer/tests/api/v1/test_list_events_scenarios.py similarity index 100% rename from tests/api/v1/test_list_events_scenarios.py rename to ceilometer/tests/api/v1/test_list_events_scenarios.py diff --git a/tests/api/v1/test_list_meters_scenarios.py b/ceilometer/tests/api/v1/test_list_meters_scenarios.py similarity index 100% rename from tests/api/v1/test_list_meters_scenarios.py rename to ceilometer/tests/api/v1/test_list_meters_scenarios.py diff --git a/tests/api/v1/test_list_projects_scenarios.py b/ceilometer/tests/api/v1/test_list_projects_scenarios.py similarity index 100% rename from tests/api/v1/test_list_projects_scenarios.py rename to ceilometer/tests/api/v1/test_list_projects_scenarios.py diff --git a/tests/api/v1/test_list_resources_scenarios.py b/ceilometer/tests/api/v1/test_list_resources_scenarios.py similarity index 100% rename from tests/api/v1/test_list_resources_scenarios.py rename to ceilometer/tests/api/v1/test_list_resources_scenarios.py diff --git a/tests/api/v1/test_list_sources_scenarios.py b/ceilometer/tests/api/v1/test_list_sources_scenarios.py similarity index 100% rename from tests/api/v1/test_list_sources_scenarios.py rename to ceilometer/tests/api/v1/test_list_sources_scenarios.py diff --git a/tests/api/v1/test_list_users_scenarios.py b/ceilometer/tests/api/v1/test_list_users_scenarios.py similarity index 100% rename from tests/api/v1/test_list_users_scenarios.py rename to ceilometer/tests/api/v1/test_list_users_scenarios.py diff --git a/tests/api/v1/test_max_project_volume_scenarios.py b/ceilometer/tests/api/v1/test_max_project_volume_scenarios.py similarity index 100% rename from tests/api/v1/test_max_project_volume_scenarios.py rename to ceilometer/tests/api/v1/test_max_project_volume_scenarios.py diff --git a/tests/api/v1/test_max_resource_volume_scenarios.py b/ceilometer/tests/api/v1/test_max_resource_volume_scenarios.py similarity index 100% rename from tests/api/v1/test_max_resource_volume_scenarios.py rename to ceilometer/tests/api/v1/test_max_resource_volume_scenarios.py diff --git a/tests/api/v1/test_sum_project_volume_scenarios.py b/ceilometer/tests/api/v1/test_sum_project_volume_scenarios.py similarity index 100% rename from tests/api/v1/test_sum_project_volume_scenarios.py rename to ceilometer/tests/api/v1/test_sum_project_volume_scenarios.py diff --git a/tests/api/v1/test_sum_resource_volume_scenarios.py b/ceilometer/tests/api/v1/test_sum_resource_volume_scenarios.py similarity index 100% rename from tests/api/v1/test_sum_resource_volume_scenarios.py rename to ceilometer/tests/api/v1/test_sum_resource_volume_scenarios.py diff --git a/tests/api/v2/base.py b/ceilometer/tests/api/v2/__init__.py similarity index 100% rename from tests/api/v2/base.py rename to ceilometer/tests/api/v2/__init__.py diff --git a/tests/api/v2/test_acl_scenarios.py b/ceilometer/tests/api/v2/test_acl_scenarios.py similarity index 99% rename from tests/api/v2/test_acl_scenarios.py rename to ceilometer/tests/api/v2/test_acl_scenarios.py index 99d1acd00a..97f4ad879c 100644 --- a/tests/api/v2/test_acl_scenarios.py +++ b/ceilometer/tests/api/v2/test_acl_scenarios.py @@ -22,13 +22,14 @@ import json import testscenarios -from .base import FunctionalTest from ceilometer.api import acl from ceilometer.openstack.common import timeutils from ceilometer.publisher import rpc from ceilometer import sample +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db + load_tests = testscenarios.load_tests_apply_scenarios VALID_TOKEN = '4562138218392831' diff --git a/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py similarity index 99% rename from tests/api/v2/test_alarm_scenarios.py rename to ceilometer/tests/api/v2/test_alarm_scenarios.py index 0738485da6..5c7b98349c 100644 --- a/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -28,8 +28,8 @@ import uuid import mock import testscenarios -from .base import FunctionalTest from ceilometer.storage.models import Alarm +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db diff --git a/tests/api/v2/test_app.py b/ceilometer/tests/api/v2/test_app.py similarity index 99% rename from tests/api/v2/test_app.py rename to ceilometer/tests/api/v2/test_app.py index afd9c93490..a68f7284ed 100644 --- a/tests/api/v2/test_app.py +++ b/ceilometer/tests/api/v2/test_app.py @@ -20,7 +20,6 @@ """ import os -from .base import FunctionalTest from ceilometer.api import acl from ceilometer.api import app from ceilometer.openstack.common import fileutils @@ -28,6 +27,7 @@ from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common.fixture import moxstubout from ceilometer.openstack.common import gettextutils from ceilometer import service +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import base from ceilometer.tests import db as tests_db diff --git a/tests/api/v2/test_compute_duration_by_resource_scenarios.py b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py similarity index 99% rename from tests/api/v2/test_compute_duration_by_resource_scenarios.py rename to ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py index 46f2d19f06..d4b67f6103 100644 --- a/tests/api/v2/test_compute_duration_by_resource_scenarios.py +++ b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py @@ -24,11 +24,12 @@ import logging import mock import testscenarios -from .base import FunctionalTest from ceilometer.openstack.common import timeutils from ceilometer.storage import models +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db + load_tests = testscenarios.load_tests_apply_scenarios LOG = logging.getLogger(__name__) diff --git a/tests/api/v2/test_list_events_scenarios.py b/ceilometer/tests/api/v2/test_list_events_scenarios.py similarity index 99% rename from tests/api/v2/test_list_events_scenarios.py rename to ceilometer/tests/api/v2/test_list_events_scenarios.py index b5e7268dfe..307f922ccb 100644 --- a/tests/api/v2/test_list_events_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_events_scenarios.py @@ -24,11 +24,12 @@ import logging import testscenarios import webtest.app -from .base import FunctionalTest from ceilometer.publisher import rpc from ceilometer import sample +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db + load_tests = testscenarios.load_tests_apply_scenarios LOG = logging.getLogger(__name__) diff --git a/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/api/v2/test_list_meters_scenarios.py similarity index 99% rename from tests/api/v2/test_list_meters_scenarios.py rename to ceilometer/tests/api/v2/test_list_meters_scenarios.py index 4c7191858c..52351a3ec8 100644 --- a/tests/api/v2/test_list_meters_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_meters_scenarios.py @@ -26,10 +26,9 @@ import testscenarios from ceilometer.publisher import rpc from ceilometer import sample +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db -from .base import FunctionalTest - load_tests = testscenarios.load_tests_apply_scenarios LOG = logging.getLogger(__name__) diff --git a/tests/api/v2/test_list_resources_scenarios.py b/ceilometer/tests/api/v2/test_list_resources_scenarios.py similarity index 99% rename from tests/api/v2/test_list_resources_scenarios.py rename to ceilometer/tests/api/v2/test_list_resources_scenarios.py index 0d18ea1d6d..ef2acb62fb 100644 --- a/tests/api/v2/test_list_resources_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_resources_scenarios.py @@ -25,10 +25,9 @@ import testscenarios from ceilometer.publisher import rpc from ceilometer import sample +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db -from .base import FunctionalTest - load_tests = testscenarios.load_tests_apply_scenarios LOG = logging.getLogger(__name__) @@ -37,8 +36,6 @@ LOG = logging.getLogger(__name__) class TestListResources(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): - SOURCE_DATA = {'test_list_resources': {}} - def test_empty(self): data = self.get_json('/resources') self.assertEqual([], data) diff --git a/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/api/v2/test_post_samples_scenarios.py similarity index 99% rename from tests/api/v2/test_post_samples_scenarios.py rename to ceilometer/tests/api/v2/test_post_samples_scenarios.py index c02a23b00f..64bc246b0d 100644 --- a/tests/api/v2/test_post_samples_scenarios.py +++ b/ceilometer/tests/api/v2/test_post_samples_scenarios.py @@ -24,12 +24,13 @@ import logging import testscenarios -from .base import FunctionalTest from ceilometer.openstack.common.fixture import moxstubout from ceilometer.openstack.common import rpc from ceilometer.openstack.common import timeutils +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db + load_tests = testscenarios.load_tests_apply_scenarios LOG = logging.getLogger(__name__) diff --git a/tests/api/v2/test_query.py b/ceilometer/tests/api/v2/test_query.py similarity index 100% rename from tests/api/v2/test_query.py rename to ceilometer/tests/api/v2/test_query.py diff --git a/tests/api/v2/test_statistics.py b/ceilometer/tests/api/v2/test_statistics.py similarity index 100% rename from tests/api/v2/test_statistics.py rename to ceilometer/tests/api/v2/test_statistics.py diff --git a/tests/api/v2/test_statistics_scenarios.py b/ceilometer/tests/api/v2/test_statistics_scenarios.py similarity index 99% rename from tests/api/v2/test_statistics_scenarios.py rename to ceilometer/tests/api/v2/test_statistics_scenarios.py index 50eeb1d406..c567353b35 100644 --- a/tests/api/v2/test_statistics_scenarios.py +++ b/ceilometer/tests/api/v2/test_statistics_scenarios.py @@ -21,15 +21,15 @@ import datetime import testscenarios -from . import base from ceilometer.publisher import rpc from ceilometer import sample +from ceilometer.tests.api.v2 import FunctionalTest from ceilometer.tests import db as tests_db load_tests = testscenarios.load_tests_apply_scenarios -class TestMaxProjectVolume(base.FunctionalTest, +class TestMaxProjectVolume(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): PATH = '/meters/volume.size/statistics' @@ -127,7 +127,7 @@ class TestMaxProjectVolume(base.FunctionalTest, self.assertEqual(data[0]['count'], 1) -class TestMaxResourceVolume(base.FunctionalTest, +class TestMaxResourceVolume(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): PATH = '/meters/volume.size/statistics' @@ -248,7 +248,7 @@ class TestMaxResourceVolume(base.FunctionalTest, self.assertEqual(data[0]['count'], 1) -class TestSumProjectVolume(base.FunctionalTest, +class TestSumProjectVolume(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): PATH = '/meters/volume.size/statistics' @@ -348,7 +348,7 @@ class TestSumProjectVolume(base.FunctionalTest, self.assertEqual(data[0]['count'], 1) -class TestSumResourceVolume(base.FunctionalTest, +class TestSumResourceVolume(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): PATH = '/meters/volume.size/statistics' @@ -474,7 +474,7 @@ class TestSumResourceVolume(base.FunctionalTest, self.assertEqual(data[0]['count'], 1) -class TestGroupByInstance(base.FunctionalTest, +class TestGroupByInstance(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): PATH = '/meters/instance/statistics' @@ -1219,7 +1219,7 @@ class TestGroupByInstance(base.FunctionalTest, u'2013-08-01T14:00:00']) -class TestGroupBySource(base.FunctionalTest, +class TestGroupBySource(FunctionalTest, tests_db.MixinTestsWithBackendScenarios): # FIXME(terriyu): We have to put test_group_by_source in its own class diff --git a/tests/api/v2/test_wsme_custom_type.py b/ceilometer/tests/api/v2/test_wsme_custom_type.py similarity index 100% rename from tests/api/v2/test_wsme_custom_type.py rename to ceilometer/tests/api/v2/test_wsme_custom_type.py diff --git a/tests/api/__init__.py b/ceilometer/tests/central/__init__.py similarity index 100% rename from tests/api/__init__.py rename to ceilometer/tests/central/__init__.py diff --git a/tests/central/test_manager.py b/ceilometer/tests/central/test_manager.py similarity index 97% rename from tests/central/test_manager.py rename to ceilometer/tests/central/test_manager.py index b3018dd526..12ad1e7da3 100644 --- a/tests/central/test_manager.py +++ b/ceilometer/tests/central/test_manager.py @@ -24,7 +24,7 @@ import mock from ceilometer.central import manager from ceilometer.openstack.common.fixture import moxstubout from ceilometer.openstack.common import test -from tests import agentbase +from ceilometer.tests import agentbase class TestManager(test.BaseTestCase): diff --git a/tests/api/v1/__init__.py b/ceilometer/tests/collector/__init__.py similarity index 100% rename from tests/api/v1/__init__.py rename to ceilometer/tests/collector/__init__.py diff --git a/tests/api/v2/__init__.py b/ceilometer/tests/collector/dispatcher/__init__.py similarity index 100% rename from tests/api/v2/__init__.py rename to ceilometer/tests/collector/dispatcher/__init__.py diff --git a/tests/collector/dispatcher/test_db.py b/ceilometer/tests/collector/dispatcher/test_db.py similarity index 100% rename from tests/collector/dispatcher/test_db.py rename to ceilometer/tests/collector/dispatcher/test_db.py diff --git a/tests/collector/dispatcher/test_file.py b/ceilometer/tests/collector/dispatcher/test_file.py similarity index 100% rename from tests/collector/dispatcher/test_file.py rename to ceilometer/tests/collector/dispatcher/test_file.py diff --git a/tests/collector/test_service.py b/ceilometer/tests/collector/test_service.py similarity index 100% rename from tests/collector/test_service.py rename to ceilometer/tests/collector/test_service.py diff --git a/tests/central/__init__.py b/ceilometer/tests/compute/__init__.py similarity index 100% rename from tests/central/__init__.py rename to ceilometer/tests/compute/__init__.py diff --git a/tests/collector/__init__.py b/ceilometer/tests/compute/pollsters/__init__.py similarity index 100% rename from tests/collector/__init__.py rename to ceilometer/tests/compute/pollsters/__init__.py diff --git a/tests/compute/pollsters/base.py b/ceilometer/tests/compute/pollsters/base.py similarity index 100% rename from tests/compute/pollsters/base.py rename to ceilometer/tests/compute/pollsters/base.py diff --git a/tests/compute/pollsters/test_cpu.py b/ceilometer/tests/compute/pollsters/test_cpu.py similarity index 100% rename from tests/compute/pollsters/test_cpu.py rename to ceilometer/tests/compute/pollsters/test_cpu.py diff --git a/tests/compute/pollsters/test_diskio.py b/ceilometer/tests/compute/pollsters/test_diskio.py similarity index 100% rename from tests/compute/pollsters/test_diskio.py rename to ceilometer/tests/compute/pollsters/test_diskio.py diff --git a/tests/compute/pollsters/test_instance.py b/ceilometer/tests/compute/pollsters/test_instance.py similarity index 100% rename from tests/compute/pollsters/test_instance.py rename to ceilometer/tests/compute/pollsters/test_instance.py diff --git a/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/compute/pollsters/test_location_metadata.py similarity index 100% rename from tests/compute/pollsters/test_location_metadata.py rename to ceilometer/tests/compute/pollsters/test_location_metadata.py diff --git a/tests/compute/pollsters/test_net.py b/ceilometer/tests/compute/pollsters/test_net.py similarity index 100% rename from tests/compute/pollsters/test_net.py rename to ceilometer/tests/compute/pollsters/test_net.py diff --git a/tests/compute/test_manager.py b/ceilometer/tests/compute/test_manager.py similarity index 98% rename from tests/compute/test_manager.py rename to ceilometer/tests/compute/test_manager.py index 9b19282f63..a61c932a0a 100644 --- a/tests/compute/test_manager.py +++ b/ceilometer/tests/compute/test_manager.py @@ -23,7 +23,7 @@ from ceilometer.compute import manager from ceilometer import nova_client from ceilometer.openstack.common.fixture import moxstubout from ceilometer.openstack.common import test -from tests import agentbase +from ceilometer.tests import agentbase class TestManager(test.BaseTestCase): diff --git a/tests/compute/test_notifications.py b/ceilometer/tests/compute/test_notifications.py similarity index 100% rename from tests/compute/test_notifications.py rename to ceilometer/tests/compute/test_notifications.py diff --git a/tests/collector/dispatcher/__init__.py b/ceilometer/tests/compute/virt/__init__.py similarity index 100% rename from tests/collector/dispatcher/__init__.py rename to ceilometer/tests/compute/virt/__init__.py diff --git a/tests/compute/__init__.py b/ceilometer/tests/compute/virt/hyperv/__init__.py similarity index 100% rename from tests/compute/__init__.py rename to ceilometer/tests/compute/virt/hyperv/__init__.py diff --git a/tests/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/compute/virt/hyperv/test_inspector.py similarity index 100% rename from tests/compute/virt/hyperv/test_inspector.py rename to ceilometer/tests/compute/virt/hyperv/test_inspector.py diff --git a/tests/compute/virt/hyperv/test_utilsv2.py b/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py similarity index 100% rename from tests/compute/virt/hyperv/test_utilsv2.py rename to ceilometer/tests/compute/virt/hyperv/test_utilsv2.py diff --git a/tests/compute/pollsters/__init__.py b/ceilometer/tests/compute/virt/libvirt/__init__.py similarity index 100% rename from tests/compute/pollsters/__init__.py rename to ceilometer/tests/compute/virt/libvirt/__init__.py diff --git a/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/compute/virt/libvirt/test_inspector.py similarity index 100% rename from tests/compute/virt/libvirt/test_inspector.py rename to ceilometer/tests/compute/virt/libvirt/test_inspector.py diff --git a/tests/compute/virt/__init__.py b/ceilometer/tests/energy/__init__.py similarity index 100% rename from tests/compute/virt/__init__.py rename to ceilometer/tests/energy/__init__.py diff --git a/tests/energy/test_kwapi.py b/ceilometer/tests/energy/test_kwapi.py similarity index 100% rename from tests/energy/test_kwapi.py rename to ceilometer/tests/energy/test_kwapi.py diff --git a/tests/compute/virt/hyperv/__init__.py b/ceilometer/tests/image/__init__.py similarity index 100% rename from tests/compute/virt/hyperv/__init__.py rename to ceilometer/tests/image/__init__.py diff --git a/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py similarity index 100% rename from tests/image/test_glance.py rename to ceilometer/tests/image/test_glance.py diff --git a/tests/image/test_notifications.py b/ceilometer/tests/image/test_notifications.py similarity index 100% rename from tests/image/test_notifications.py rename to ceilometer/tests/image/test_notifications.py diff --git a/tests/compute/virt/libvirt/__init__.py b/ceilometer/tests/network/__init__.py similarity index 100% rename from tests/compute/virt/libvirt/__init__.py rename to ceilometer/tests/network/__init__.py diff --git a/tests/network/test_floatingip.py b/ceilometer/tests/network/test_floatingip.py similarity index 100% rename from tests/network/test_floatingip.py rename to ceilometer/tests/network/test_floatingip.py diff --git a/tests/network/test_notifications.py b/ceilometer/tests/network/test_notifications.py similarity index 100% rename from tests/network/test_notifications.py rename to ceilometer/tests/network/test_notifications.py diff --git a/tests/energy/__init__.py b/ceilometer/tests/objectstore/__init__.py similarity index 100% rename from tests/energy/__init__.py rename to ceilometer/tests/objectstore/__init__.py diff --git a/tests/objectstore/test_swift.py b/ceilometer/tests/objectstore/test_swift.py similarity index 100% rename from tests/objectstore/test_swift.py rename to ceilometer/tests/objectstore/test_swift.py diff --git a/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py similarity index 100% rename from tests/objectstore/test_swift_middleware.py rename to ceilometer/tests/objectstore/test_swift_middleware.py diff --git a/tests/image/__init__.py b/ceilometer/tests/publisher/__init__.py similarity index 100% rename from tests/image/__init__.py rename to ceilometer/tests/publisher/__init__.py diff --git a/tests/publisher/test_file.py b/ceilometer/tests/publisher/test_file.py similarity index 100% rename from tests/publisher/test_file.py rename to ceilometer/tests/publisher/test_file.py diff --git a/tests/publisher/test_rpc_publisher.py b/ceilometer/tests/publisher/test_rpc_publisher.py similarity index 100% rename from tests/publisher/test_rpc_publisher.py rename to ceilometer/tests/publisher/test_rpc_publisher.py diff --git a/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py similarity index 100% rename from tests/publisher/test_udp.py rename to ceilometer/tests/publisher/test_udp.py diff --git a/tests/sources.json b/ceilometer/tests/sources.json similarity index 100% rename from tests/sources.json rename to ceilometer/tests/sources.json diff --git a/tests/network/__init__.py b/ceilometer/tests/storage/__init__.py similarity index 100% rename from tests/network/__init__.py rename to ceilometer/tests/storage/__init__.py diff --git a/tests/objectstore/__init__.py b/ceilometer/tests/storage/sqlalchemy/__init__.py similarity index 100% rename from tests/objectstore/__init__.py rename to ceilometer/tests/storage/sqlalchemy/__init__.py diff --git a/tests/storage/sqlalchemy/test_models.py b/ceilometer/tests/storage/sqlalchemy/test_models.py similarity index 100% rename from tests/storage/sqlalchemy/test_models.py rename to ceilometer/tests/storage/sqlalchemy/test_models.py diff --git a/tests/storage/test_base.py b/ceilometer/tests/storage/test_base.py similarity index 100% rename from tests/storage/test_base.py rename to ceilometer/tests/storage/test_base.py diff --git a/tests/storage/test_get_engine.py b/ceilometer/tests/storage/test_get_engine.py similarity index 100% rename from tests/storage/test_get_engine.py rename to ceilometer/tests/storage/test_get_engine.py diff --git a/tests/storage/test_impl_hbase.py b/ceilometer/tests/storage/test_impl_hbase.py similarity index 100% rename from tests/storage/test_impl_hbase.py rename to ceilometer/tests/storage/test_impl_hbase.py diff --git a/tests/storage/test_impl_log.py b/ceilometer/tests/storage/test_impl_log.py similarity index 100% rename from tests/storage/test_impl_log.py rename to ceilometer/tests/storage/test_impl_log.py diff --git a/tests/storage/test_impl_mongodb.py b/ceilometer/tests/storage/test_impl_mongodb.py similarity index 99% rename from tests/storage/test_impl_mongodb.py rename to ceilometer/tests/storage/test_impl_mongodb.py index 5bd48d4a47..4eedd73bab 100644 --- a/tests/storage/test_impl_mongodb.py +++ b/ceilometer/tests/storage/test_impl_mongodb.py @@ -33,7 +33,7 @@ from ceilometer.storage.base import MultipleResultsFound from ceilometer.storage.base import NoResultFound from ceilometer.storage import impl_mongodb from ceilometer.tests import db as tests_db -from tests.storage import test_storage_scenarios +from ceilometer.tests.storage import test_storage_scenarios class MongoDBEngineTestBase(tests_db.TestBase): diff --git a/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/storage/test_impl_sqlalchemy.py similarity index 100% rename from tests/storage/test_impl_sqlalchemy.py rename to ceilometer/tests/storage/test_impl_sqlalchemy.py diff --git a/tests/storage/test_models.py b/ceilometer/tests/storage/test_models.py similarity index 100% rename from tests/storage/test_models.py rename to ceilometer/tests/storage/test_models.py diff --git a/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py similarity index 100% rename from tests/storage/test_storage_scenarios.py rename to ceilometer/tests/storage/test_storage_scenarios.py diff --git a/tests/test_bin.py b/ceilometer/tests/test_bin.py similarity index 98% rename from tests/test_bin.py rename to ceilometer/tests/test_bin.py index de311107fe..09a6ee65e4 100644 --- a/tests/test_bin.py +++ b/ceilometer/tests/test_bin.py @@ -85,7 +85,7 @@ class BinApiTestCase(base.BaseTestCase): self.api_port = random.randint(10000, 11000) self.http = httplib2.Http() pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml') - policy_file = self.path_get('tests/policy.json') + policy_file = self.path_get('etc/ceilometer/policy.json') content = "[DEFAULT]\n"\ "rpc_backend=ceilometer.openstack.common.rpc.impl_fake\n"\ "auth_strategy=noauth\n"\ diff --git a/tests/test_middleware.py b/ceilometer/tests/test_middleware.py similarity index 100% rename from tests/test_middleware.py rename to ceilometer/tests/test_middleware.py diff --git a/tests/test_notifier.py b/ceilometer/tests/test_notifier.py similarity index 100% rename from tests/test_notifier.py rename to ceilometer/tests/test_notifier.py diff --git a/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py similarity index 100% rename from tests/test_novaclient.py rename to ceilometer/tests/test_novaclient.py diff --git a/tests/test_pipeline.py b/ceilometer/tests/test_pipeline.py similarity index 100% rename from tests/test_pipeline.py rename to ceilometer/tests/test_pipeline.py diff --git a/tests/test_plugin.py b/ceilometer/tests/test_plugin.py similarity index 100% rename from tests/test_plugin.py rename to ceilometer/tests/test_plugin.py diff --git a/tests/test_service.py b/ceilometer/tests/test_service.py similarity index 98% rename from tests/test_service.py rename to ceilometer/tests/test_service.py index 586cd24ffc..0334bd5a03 100644 --- a/tests/test_service.py +++ b/ceilometer/tests/test_service.py @@ -74,7 +74,7 @@ class ServiceRestartTest(base.BaseTestCase): shutil.copy(self.path_get('etc/ceilometer/pipeline.yaml'), self.pipeline_cfg_file) self.pipelinecfg_read_from_file() - policy_file = self.path_get('tests/policy.json') + policy_file = self.path_get('etc/ceilometer/policy.json') content = "[DEFAULT]\n"\ "rpc_backend=ceilometer.openstack.common.rpc.impl_fake\n"\ "auth_strategy=noauth\n"\ diff --git a/tests/test_utils.py b/ceilometer/tests/test_utils.py similarity index 100% rename from tests/test_utils.py rename to ceilometer/tests/test_utils.py diff --git a/tests/publisher/__init__.py b/ceilometer/tests/volume/__init__.py similarity index 100% rename from tests/publisher/__init__.py rename to ceilometer/tests/volume/__init__.py diff --git a/tests/volume/test_notifications.py b/ceilometer/tests/volume/test_notifications.py similarity index 100% rename from tests/volume/test_notifications.py rename to ceilometer/tests/volume/test_notifications.py diff --git a/tests/policy.json b/tests/policy.json deleted file mode 100644 index 4f119b4822..0000000000 --- a/tests/policy.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "context_is_admin": [["role:admin"]], - "admin_api": [["is_admin:True"]] -} diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/storage/sqlalchemy/__init__.py b/tests/storage/sqlalchemy/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/volume/__init__.py b/tests/volume/__init__.py deleted file mode 100644 index e69de29bb2..0000000000