From 49f53f35a5b7d616517b23e75b18e159ece41d4a Mon Sep 17 00:00:00 2001 From: Ilya Tyaptin Date: Tue, 21 Jul 2015 18:02:13 +0300 Subject: [PATCH] Initial separating unit and functional tests Currently we run tests which uses real backend or real daemons with other unit tests. This CR is initial for sequence of functional tests implementation. It contains only moving files and modules to right directories and fixing tox.ini. This approach allows to avoid constantly rebase conflicts, because git handles file removing correct. Next step - separate classes and functions from moved files to right test types. Depends-On: Ifdb0de150b2c738117308b2aae6c0c197e162821 Change-Id: I16b84ed83ac075658626f3ec6a35a24e228b61e7 Partialy-Implement: blueprint ceilometer-functional-tests --- .../tests/{ => functional}/api/__init__.py | 0 .../tests/{ => functional}/api/v2/__init__.py | 2 +- .../api/v2/test_acl_scenarios.py | 4 ++-- .../api/v2/test_alarm_scenarios.py | 3 ++- .../api/v2/test_api_upgrade.py | 2 +- .../tests/{ => functional}/api/v2/test_app.py | 2 +- .../api/v2/test_capabilities.py | 2 +- .../api/v2/test_complex_query_scenarios.py | 2 +- ..._compute_duration_by_resource_scenarios.py | 2 +- .../api/v2/test_event_scenarios.py | 2 +- .../api/v2/test_list_events_scenarios.py | 2 +- .../api/v2/test_list_meters_scenarios.py | 2 +- .../api/v2/test_list_resources_scenarios.py | 2 +- .../api/v2/test_post_samples_scenarios.py | 2 +- .../api/v2/test_statistics_scenarios.py | 2 +- .../{agent => functional/gabbi}/__init__.py | 0 .../tests/{ => functional}/gabbi/fixtures.py | 0 .../gabbi/gabbits/alarms.yaml | 0 .../gabbi/gabbits/api_events_no_data.yaml | 0 .../gabbi/gabbits/api_events_with_data.yaml | 0 .../{ => functional}/gabbi/gabbits/basic.yaml | 0 .../gabbi/gabbits/capabilities.yaml | 0 .../gabbi/gabbits/clean-samples.yaml | 0 .../gabbi/gabbits/fixture-samples.yaml | 0 .../gabbi/gabbits/meters.yaml | 0 .../gabbi/gabbits/resources-empty.yaml | 0 .../gabbi/gabbits/resources-fixtured.yaml | 0 .../gabbi/gabbits/samples.yaml | 0 .../gabbits_prefix/api_events_with_data.yaml | 0 .../gabbi/gabbits_prefix/basic.yaml | 0 .../gabbi/gabbits_prefix/clean-samples.yaml | 0 .../gabbits_prefix/resources-fixtured.yaml | 0 .../{ => functional}/gabbi/test_gabbi.py | 3 +-- .../gabbi/test_gabbi_prefix.py | 3 +-- .../tests/functional/hooks/post_test_hook.sh | 8 +++++-- .../publisher}/__init__.py | 0 .../{ => functional}/publisher/test_direct.py | 0 .../storage}/__init__.py | 0 .../{ => functional}/storage/test_impl_db2.py | 0 .../storage/test_impl_hbase.py | 0 .../{ => functional}/storage/test_impl_log.py | 0 .../storage/test_impl_mongodb.py | 0 .../storage/test_impl_sqlalchemy.py | 5 ++-- .../storage/test_pymongo_base.py | 2 +- .../storage/test_storage_scenarios.py | 0 ceilometer/tests/{ => functional}/test_bin.py | 0 .../tests/{ => functional}/test_collector.py | 0 ceilometer/tests/functional/test_empty.py | 23 ------------------- .../{ => functional}/test_notification.py | 0 .../tests/{compute => unit}/__init__.py | 0 .../notifications => unit/agent}/__init__.py | 0 .../tests/{ => unit}/agent/agentbase.py | 0 .../tests/{ => unit}/agent/test_discovery.py | 0 .../tests/{ => unit}/agent/test_manager.py | 2 +- .../tests/{ => unit}/agent/test_plugin.py | 0 .../pollsters => unit/alarm}/__init__.py | 0 .../virt => unit/alarm/evaluator}/__init__.py | 0 .../tests/{ => unit}/alarm/evaluator/base.py | 0 .../{ => unit}/alarm/evaluator/test_base.py | 0 .../alarm/evaluator/test_combination.py | 2 +- .../alarm/evaluator/test_gnocchi.py | 2 +- .../alarm/evaluator/test_threshold.py | 2 +- .../tests/{ => unit}/alarm/test_alarm_svc.py | 0 .../tests/{ => unit}/alarm/test_notifier.py | 0 ceilometer/tests/{ => unit}/alarm/test_rpc.py | 0 .../virt/hyperv => unit/api}/__init__.py | 0 ceilometer/tests/{ => unit}/api/test_app.py | 0 ceilometer/tests/{ => unit}/api/test_hooks.py | 0 .../tests/{ => unit}/api/test_versions.py | 2 +- .../virt/libvirt => unit/api/v2}/__init__.py | 0 .../{ => unit}/api/v2/test_complex_query.py | 0 .../tests/{ => unit}/api/v2/test_query.py | 0 .../{ => unit}/api/v2/test_statistics.py | 0 .../api/v2/test_wsme_custom_type.py | 0 .../virt/vmware => unit/compute}/__init__.py | 0 .../compute/notifications}/__init__.py | 0 .../compute/notifications/test_cpu.py | 0 .../compute/notifications/test_instance.py | 0 .../compute/pollsters}/__init__.py | 0 .../{ => unit}/compute/pollsters/base.py | 0 .../{ => unit}/compute/pollsters/test_cpu.py | 2 +- .../compute/pollsters/test_diskio.py | 0 .../compute/pollsters/test_instance.py | 2 +- .../pollsters/test_location_metadata.py | 0 .../compute/pollsters/test_memory.py | 2 +- .../{ => unit}/compute/pollsters/test_net.py | 2 +- .../compute/virt}/__init__.py | 0 .../compute/virt/hyperv}/__init__.py | 0 .../compute/virt/hyperv/test_inspector.py | 0 .../compute/virt/hyperv/test_utilsv2.py | 0 .../compute/virt/libvirt}/__init__.py | 0 .../compute/virt/libvirt/test_inspector.py | 0 .../compute/virt/vmware}/__init__.py | 0 .../compute/virt/vmware/test_inspector.py | 0 .../virt/vmware/test_vsphere_operations.py | 0 .../compute/virt/xenapi}/__init__.py | 0 .../compute/virt/xenapi/test_inspector.py | 0 .../data_processing}/__init__.py | 0 .../data_processing/test_notifications.py | 0 .../{hardware => unit/database}/__init__.py | 0 .../{ => unit}/database/test_notifications.py | 0 .../inspector => unit/dispatcher}/__init__.py | 0 .../tests/{ => unit}/dispatcher/test_db.py | 0 .../tests/{ => unit}/dispatcher/test_file.py | 0 .../{ => unit}/dispatcher/test_gnocchi.py | 0 .../tests/{ => unit}/dispatcher/test_http.py | 0 .../pollsters => unit/dns}/__init__.py | 0 .../{ => unit}/dns/test_notifications.py | 0 .../{identity => unit/energy}/__init__.py | 0 .../tests/{ => unit}/energy/test_kwapi.py | 0 .../tests/{image => unit/event}/__init__.py | 0 .../tests/{ => unit}/event/test_converter.py | 0 .../tests/{ => unit}/event/test_endpoint.py | 0 .../{ => unit}/event/test_trait_plugins.py | 0 .../tests/{ipmi => unit/hardware}/__init__.py | 0 .../hardware/inspector}/__init__.py | 0 .../hardware/inspector/test_inspector.py | 0 .../hardware/inspector/test_snmp.py | 0 .../hardware/pollsters}/__init__.py | 0 .../{ => unit}/hardware/pollsters/base.py | 0 .../{ => unit}/hardware/pollsters/test_cpu.py | 2 +- .../hardware/pollsters/test_disk.py | 2 +- .../hardware/pollsters/test_memory.py | 2 +- .../{ => unit}/hardware/pollsters/test_net.py | 2 +- .../pollsters/test_network_aggregated.py | 2 +- .../hardware/pollsters/test_system.py | 2 +- .../hardware/pollsters/test_util.py | 0 .../pollsters => unit/identity}/__init__.py | 0 .../{ => unit}/identity/test_notifications.py | 0 .../image}/__init__.py | 0 .../tests/{ => unit}/image/test_glance.py | 0 .../{ => unit}/image/test_notifications.py | 0 .../tests/{meter => unit/ipmi}/__init__.py | 0 .../ipmi/notifications}/__init__.py | 0 .../ipmi/notifications/ipmi_test_data.py | 0 .../ipmi/notifications/test_ironic.py | 2 +- .../ipmi/platform}/__init__.py | 0 .../{ => unit}/ipmi/platform/fake_utils.py | 2 +- .../ipmi/platform/ipmitool_test_data.py | 0 .../ipmi/platform/test_intel_node_manager.py | 6 ++--- .../ipmi/platform/test_ipmi_sensor.py | 2 +- .../ipmi/pollsters}/__init__.py | 0 .../tests/{ => unit}/ipmi/pollsters/base.py | 0 .../{ => unit}/ipmi/pollsters/test_node.py | 3 +-- .../{ => unit}/ipmi/pollsters/test_sensor.py | 5 ++-- .../key_value_storage}/__init__.py | 0 .../key_value_storage/test_notifications.py | 0 .../{objectstore => unit/meter}/__init__.py | 0 .../{ => unit}/meter/test_notifications.py | 0 .../network}/__init__.py | 0 .../network/services}/__init__.py | 0 .../{ => unit}/network/services/test_fwaas.py | 0 .../{ => unit}/network/services/test_lbaas.py | 0 .../network/services/test_vpnaas.py | 0 .../{ => unit}/network/statistics/__init__.py | 0 .../statistics/opencontrail}/__init__.py | 0 .../statistics/opencontrail/test_client.py | 0 .../statistics/opencontrail/test_driver.py | 0 .../statistics/opendaylight}/__init__.py | 0 .../statistics/opendaylight/test_client.py | 0 .../statistics/opendaylight/test_driver.py | 0 .../network/statistics/test_driver.py | 0 .../network/statistics/test_flow.py | 2 +- .../network/statistics/test_port.py | 2 +- .../network/statistics/test_statistics.py | 0 .../network/statistics/test_switch.py | 2 +- .../network/statistics/test_table.py | 2 +- .../{ => unit}/network/test_floatingip.py | 0 .../{ => unit}/network/test_notifications.py | 0 .../objectstore}/__init__.py | 0 .../objectstore/test_notifications.py | 0 .../tests/{ => unit}/objectstore/test_rgw.py | 0 .../{ => unit}/objectstore/test_rgw_client.py | 0 .../{ => unit}/objectstore/test_swift.py | 0 .../orchestration}/__init__.py | 0 .../orchestration/test_notifications.py | 0 .../{volume => unit/profiler}/__init__.py | 0 .../{ => unit}/profiler/test_notifications.py | 0 ceilometer/tests/unit/publisher/__init__.py | 0 .../tests/{ => unit}/publisher/test_file.py | 0 .../publisher/test_kafka_broker_publisher.py | 0 .../publisher/test_messaging_publisher.py | 0 .../tests/{ => unit}/publisher/test_udp.py | 0 .../tests/{ => unit}/publisher/test_utils.py | 0 ceilometer/tests/unit/storage/__init__.py | 0 .../tests/unit/storage/sqlalchemy/__init__.py | 0 .../storage/sqlalchemy/test_models.py | 0 .../tests/{ => unit}/storage/test_base.py | 1 - .../{ => unit}/storage/test_get_connection.py | 0 .../tests/{ => unit}/storage/test_models.py | 0 ceilometer/tests/unit/telemetry/__init__.py | 0 .../telemetry/test_notifications.py | 0 .../tests/{ => unit}/test_coordination.py | 0 .../{ => unit}/test_decoupled_pipeline.py | 0 .../tests/{ => unit}/test_event_pipeline.py | 0 ceilometer/tests/{ => unit}/test_hacking.py | 0 ceilometer/tests/{ => unit}/test_messaging.py | 0 .../tests/{ => unit}/test_middleware.py | 0 .../tests/{ => unit}/test_neutronclient.py | 0 .../tests/{ => unit}/test_novaclient.py | 0 ceilometer/tests/{ => unit}/test_sample.py | 0 ceilometer/tests/{ => unit}/test_utils.py | 0 ceilometer/tests/unit/volume/__init__.py | 0 .../{ => unit}/volume/test_notifications.py | 0 tox.ini | 9 ++++++-- 205 files changed, 63 insertions(+), 80 deletions(-) rename ceilometer/tests/{ => functional}/api/__init__.py (100%) rename ceilometer/tests/{ => functional}/api/v2/__init__.py (93%) rename ceilometer/tests/{ => functional}/api/v2/test_acl_scenarios.py (98%) rename ceilometer/tests/{ => functional}/api/v2/test_alarm_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_api_upgrade.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_app.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_capabilities.py (95%) rename ceilometer/tests/{ => functional}/api/v2/test_complex_query_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_compute_duration_by_resource_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_event_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_list_events_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_list_meters_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_list_resources_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_post_samples_scenarios.py (99%) rename ceilometer/tests/{ => functional}/api/v2/test_statistics_scenarios.py (99%) rename ceilometer/tests/{agent => functional/gabbi}/__init__.py (100%) rename ceilometer/tests/{ => functional}/gabbi/fixtures.py (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/alarms.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/api_events_no_data.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/api_events_with_data.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/basic.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/capabilities.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/clean-samples.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/fixture-samples.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/meters.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/resources-empty.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/resources-fixtured.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits/samples.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits_prefix/api_events_with_data.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits_prefix/basic.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits_prefix/clean-samples.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/gabbits_prefix/resources-fixtured.yaml (100%) rename ceilometer/tests/{ => functional}/gabbi/test_gabbi.py (94%) rename ceilometer/tests/{ => functional}/gabbi/test_gabbi_prefix.py (94%) mode change 100644 => 100755 ceilometer/tests/functional/hooks/post_test_hook.sh rename ceilometer/tests/{alarm => functional/publisher}/__init__.py (100%) rename ceilometer/tests/{ => functional}/publisher/test_direct.py (100%) rename ceilometer/tests/{alarm/evaluator => functional/storage}/__init__.py (100%) rename ceilometer/tests/{ => functional}/storage/test_impl_db2.py (100%) rename ceilometer/tests/{ => functional}/storage/test_impl_hbase.py (100%) rename ceilometer/tests/{ => functional}/storage/test_impl_log.py (100%) rename ceilometer/tests/{ => functional}/storage/test_impl_mongodb.py (100%) rename ceilometer/tests/{ => functional}/storage/test_impl_sqlalchemy.py (98%) rename ceilometer/tests/{ => functional}/storage/test_pymongo_base.py (98%) rename ceilometer/tests/{ => functional}/storage/test_storage_scenarios.py (100%) rename ceilometer/tests/{ => functional}/test_bin.py (100%) rename ceilometer/tests/{ => functional}/test_collector.py (100%) delete mode 100644 ceilometer/tests/functional/test_empty.py rename ceilometer/tests/{ => functional}/test_notification.py (100%) rename ceilometer/tests/{compute => unit}/__init__.py (100%) rename ceilometer/tests/{compute/notifications => unit/agent}/__init__.py (100%) rename ceilometer/tests/{ => unit}/agent/agentbase.py (100%) rename ceilometer/tests/{ => unit}/agent/test_discovery.py (100%) rename ceilometer/tests/{ => unit}/agent/test_manager.py (99%) rename ceilometer/tests/{ => unit}/agent/test_plugin.py (100%) rename ceilometer/tests/{compute/pollsters => unit/alarm}/__init__.py (100%) rename ceilometer/tests/{compute/virt => unit/alarm/evaluator}/__init__.py (100%) rename ceilometer/tests/{ => unit}/alarm/evaluator/base.py (100%) rename ceilometer/tests/{ => unit}/alarm/evaluator/test_base.py (100%) rename ceilometer/tests/{ => unit}/alarm/evaluator/test_combination.py (99%) rename ceilometer/tests/{ => unit}/alarm/evaluator/test_gnocchi.py (99%) rename ceilometer/tests/{ => unit}/alarm/evaluator/test_threshold.py (99%) rename ceilometer/tests/{ => unit}/alarm/test_alarm_svc.py (100%) rename ceilometer/tests/{ => unit}/alarm/test_notifier.py (100%) rename ceilometer/tests/{ => unit}/alarm/test_rpc.py (100%) rename ceilometer/tests/{compute/virt/hyperv => unit/api}/__init__.py (100%) rename ceilometer/tests/{ => unit}/api/test_app.py (100%) rename ceilometer/tests/{ => unit}/api/test_hooks.py (100%) rename ceilometer/tests/{ => unit}/api/test_versions.py (97%) rename ceilometer/tests/{compute/virt/libvirt => unit/api/v2}/__init__.py (100%) rename ceilometer/tests/{ => unit}/api/v2/test_complex_query.py (100%) rename ceilometer/tests/{ => unit}/api/v2/test_query.py (100%) rename ceilometer/tests/{ => unit}/api/v2/test_statistics.py (100%) rename ceilometer/tests/{ => unit}/api/v2/test_wsme_custom_type.py (100%) rename ceilometer/tests/{compute/virt/vmware => unit/compute}/__init__.py (100%) rename ceilometer/tests/{compute/virt/xenapi => unit/compute/notifications}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/notifications/test_cpu.py (100%) rename ceilometer/tests/{ => unit}/compute/notifications/test_instance.py (100%) rename ceilometer/tests/{data_processing => unit/compute/pollsters}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/pollsters/base.py (100%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_cpu.py (98%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_diskio.py (100%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_instance.py (98%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_location_metadata.py (100%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_memory.py (98%) rename ceilometer/tests/{ => unit}/compute/pollsters/test_net.py (99%) rename ceilometer/tests/{database => unit/compute/virt}/__init__.py (100%) rename ceilometer/tests/{dispatcher => unit/compute/virt/hyperv}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/hyperv/test_inspector.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/hyperv/test_utilsv2.py (100%) rename ceilometer/tests/{dns => unit/compute/virt/libvirt}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/libvirt/test_inspector.py (100%) rename ceilometer/tests/{energy => unit/compute/virt/vmware}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/vmware/test_inspector.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/vmware/test_vsphere_operations.py (100%) rename ceilometer/tests/{event => unit/compute/virt/xenapi}/__init__.py (100%) rename ceilometer/tests/{ => unit}/compute/virt/xenapi/test_inspector.py (100%) rename ceilometer/tests/{gabbi => unit/data_processing}/__init__.py (100%) rename ceilometer/tests/{ => unit}/data_processing/test_notifications.py (100%) rename ceilometer/tests/{hardware => unit/database}/__init__.py (100%) rename ceilometer/tests/{ => unit}/database/test_notifications.py (100%) rename ceilometer/tests/{hardware/inspector => unit/dispatcher}/__init__.py (100%) rename ceilometer/tests/{ => unit}/dispatcher/test_db.py (100%) rename ceilometer/tests/{ => unit}/dispatcher/test_file.py (100%) rename ceilometer/tests/{ => unit}/dispatcher/test_gnocchi.py (100%) rename ceilometer/tests/{ => unit}/dispatcher/test_http.py (100%) rename ceilometer/tests/{hardware/pollsters => unit/dns}/__init__.py (100%) rename ceilometer/tests/{ => unit}/dns/test_notifications.py (100%) rename ceilometer/tests/{identity => unit/energy}/__init__.py (100%) rename ceilometer/tests/{ => unit}/energy/test_kwapi.py (100%) rename ceilometer/tests/{image => unit/event}/__init__.py (100%) rename ceilometer/tests/{ => unit}/event/test_converter.py (100%) rename ceilometer/tests/{ => unit}/event/test_endpoint.py (100%) rename ceilometer/tests/{ => unit}/event/test_trait_plugins.py (100%) rename ceilometer/tests/{ipmi => unit/hardware}/__init__.py (100%) rename ceilometer/tests/{ipmi/notifications => unit/hardware/inspector}/__init__.py (100%) rename ceilometer/tests/{ => unit}/hardware/inspector/test_inspector.py (100%) rename ceilometer/tests/{ => unit}/hardware/inspector/test_snmp.py (100%) rename ceilometer/tests/{ipmi/platform => unit/hardware/pollsters}/__init__.py (100%) rename ceilometer/tests/{ => unit}/hardware/pollsters/base.py (100%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_cpu.py (96%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_disk.py (95%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_memory.py (96%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_net.py (96%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_network_aggregated.py (95%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_system.py (96%) rename ceilometer/tests/{ => unit}/hardware/pollsters/test_util.py (100%) rename ceilometer/tests/{ipmi/pollsters => unit/identity}/__init__.py (100%) rename ceilometer/tests/{ => unit}/identity/test_notifications.py (100%) rename ceilometer/tests/{key_value_storage => unit/image}/__init__.py (100%) rename ceilometer/tests/{ => unit}/image/test_glance.py (100%) rename ceilometer/tests/{ => unit}/image/test_notifications.py (100%) rename ceilometer/tests/{meter => unit/ipmi}/__init__.py (100%) rename ceilometer/tests/{network => unit/ipmi/notifications}/__init__.py (100%) rename ceilometer/tests/{ => unit}/ipmi/notifications/ipmi_test_data.py (100%) rename ceilometer/tests/{ => unit}/ipmi/notifications/test_ironic.py (99%) rename ceilometer/tests/{network/services => unit/ipmi/platform}/__init__.py (100%) rename ceilometer/tests/{ => unit}/ipmi/platform/fake_utils.py (97%) rename ceilometer/tests/{ => unit}/ipmi/platform/ipmitool_test_data.py (100%) rename ceilometer/tests/{ => unit}/ipmi/platform/test_intel_node_manager.py (98%) rename ceilometer/tests/{ => unit}/ipmi/platform/test_ipmi_sensor.py (98%) rename ceilometer/tests/{network/statistics/opencontrail => unit/ipmi/pollsters}/__init__.py (100%) rename ceilometer/tests/{ => unit}/ipmi/pollsters/base.py (100%) rename ceilometer/tests/{ => unit}/ipmi/pollsters/test_node.py (98%) rename ceilometer/tests/{ => unit}/ipmi/pollsters/test_sensor.py (97%) rename ceilometer/tests/{network/statistics/opendaylight => unit/key_value_storage}/__init__.py (100%) rename ceilometer/tests/{ => unit}/key_value_storage/test_notifications.py (100%) rename ceilometer/tests/{objectstore => unit/meter}/__init__.py (100%) rename ceilometer/tests/{ => unit}/meter/test_notifications.py (100%) rename ceilometer/tests/{orchestration => unit/network}/__init__.py (100%) rename ceilometer/tests/{profiler => unit/network/services}/__init__.py (100%) rename ceilometer/tests/{ => unit}/network/services/test_fwaas.py (100%) rename ceilometer/tests/{ => unit}/network/services/test_lbaas.py (100%) rename ceilometer/tests/{ => unit}/network/services/test_vpnaas.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/__init__.py (100%) rename ceilometer/tests/{publisher => unit/network/statistics/opencontrail}/__init__.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/opencontrail/test_client.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/opencontrail/test_driver.py (100%) rename ceilometer/tests/{storage => unit/network/statistics/opendaylight}/__init__.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/opendaylight/test_client.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/opendaylight/test_driver.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/test_driver.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/test_flow.py (97%) rename ceilometer/tests/{ => unit}/network/statistics/test_port.py (98%) rename ceilometer/tests/{ => unit}/network/statistics/test_statistics.py (100%) rename ceilometer/tests/{ => unit}/network/statistics/test_switch.py (94%) rename ceilometer/tests/{ => unit}/network/statistics/test_table.py (96%) rename ceilometer/tests/{ => unit}/network/test_floatingip.py (100%) rename ceilometer/tests/{ => unit}/network/test_notifications.py (100%) rename ceilometer/tests/{storage/sqlalchemy => unit/objectstore}/__init__.py (100%) rename ceilometer/tests/{ => unit}/objectstore/test_notifications.py (100%) rename ceilometer/tests/{ => unit}/objectstore/test_rgw.py (100%) rename ceilometer/tests/{ => unit}/objectstore/test_rgw_client.py (100%) rename ceilometer/tests/{ => unit}/objectstore/test_swift.py (100%) rename ceilometer/tests/{telemetry => unit/orchestration}/__init__.py (100%) rename ceilometer/tests/{ => unit}/orchestration/test_notifications.py (100%) rename ceilometer/tests/{volume => unit/profiler}/__init__.py (100%) rename ceilometer/tests/{ => unit}/profiler/test_notifications.py (100%) create mode 100644 ceilometer/tests/unit/publisher/__init__.py rename ceilometer/tests/{ => unit}/publisher/test_file.py (100%) rename ceilometer/tests/{ => unit}/publisher/test_kafka_broker_publisher.py (100%) rename ceilometer/tests/{ => unit}/publisher/test_messaging_publisher.py (100%) rename ceilometer/tests/{ => unit}/publisher/test_udp.py (100%) rename ceilometer/tests/{ => unit}/publisher/test_utils.py (100%) create mode 100644 ceilometer/tests/unit/storage/__init__.py create mode 100644 ceilometer/tests/unit/storage/sqlalchemy/__init__.py rename ceilometer/tests/{ => unit}/storage/sqlalchemy/test_models.py (100%) rename ceilometer/tests/{ => unit}/storage/test_base.py (99%) rename ceilometer/tests/{ => unit}/storage/test_get_connection.py (100%) rename ceilometer/tests/{ => unit}/storage/test_models.py (100%) create mode 100644 ceilometer/tests/unit/telemetry/__init__.py rename ceilometer/tests/{ => unit}/telemetry/test_notifications.py (100%) rename ceilometer/tests/{ => unit}/test_coordination.py (100%) rename ceilometer/tests/{ => unit}/test_decoupled_pipeline.py (100%) rename ceilometer/tests/{ => unit}/test_event_pipeline.py (100%) rename ceilometer/tests/{ => unit}/test_hacking.py (100%) rename ceilometer/tests/{ => unit}/test_messaging.py (100%) rename ceilometer/tests/{ => unit}/test_middleware.py (100%) rename ceilometer/tests/{ => unit}/test_neutronclient.py (100%) rename ceilometer/tests/{ => unit}/test_novaclient.py (100%) rename ceilometer/tests/{ => unit}/test_sample.py (100%) rename ceilometer/tests/{ => unit}/test_utils.py (100%) create mode 100644 ceilometer/tests/unit/volume/__init__.py rename ceilometer/tests/{ => unit}/volume/test_notifications.py (100%) diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/functional/api/__init__.py similarity index 100% rename from ceilometer/tests/api/__init__.py rename to ceilometer/tests/functional/api/__init__.py diff --git a/ceilometer/tests/api/v2/__init__.py b/ceilometer/tests/functional/api/v2/__init__.py similarity index 93% rename from ceilometer/tests/api/v2/__init__.py rename to ceilometer/tests/functional/api/v2/__init__.py index 478febc0af..fc70f5e240 100644 --- a/ceilometer/tests/api/v2/__init__.py +++ b/ceilometer/tests/functional/api/v2/__init__.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometer.tests import api +from ceilometer.tests.functional import api class FunctionalTest(api.FunctionalTest): diff --git a/ceilometer/tests/api/v2/test_acl_scenarios.py b/ceilometer/tests/functional/api/v2/test_acl_scenarios.py similarity index 98% rename from ceilometer/tests/api/v2/test_acl_scenarios.py rename to ceilometer/tests/functional/api/v2/test_acl_scenarios.py index 59da4aaa4c..b8a774373d 100644 --- a/ceilometer/tests/api/v2/test_acl_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_acl_scenarios.py @@ -24,9 +24,9 @@ import webtest from ceilometer.api import app from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests import api as acl -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional import api as acl +from ceilometer.tests.functional.api import v2 VALID_TOKEN = '4562138218392831' VALID_TOKEN2 = '4562138218392832' diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/functional/api/v2/test_alarm_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_alarm_scenarios.py rename to ceilometer/tests/functional/api/v2/test_alarm_scenarios.py index 47993508ee..f036844fdb 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_alarm_scenarios.py @@ -21,15 +21,16 @@ import mock import oslo_messaging.conffixture from oslo_serialization import jsonutils import requests + import six from six import moves import six.moves.urllib.parse as urlparse from ceilometer.alarm.storage import models from ceilometer import messaging -from ceilometer.tests.api import v2 from ceilometer.tests import constants from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestListEmptyAlarms(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_api_upgrade.py b/ceilometer/tests/functional/api/v2/test_api_upgrade.py similarity index 99% rename from ceilometer/tests/api/v2/test_api_upgrade.py rename to ceilometer/tests/functional/api/v2/test_api_upgrade.py index 0fb38a36dd..9a6e4beff4 100644 --- a/ceilometer/tests/api/v2/test_api_upgrade.py +++ b/ceilometer/tests/functional/api/v2/test_api_upgrade.py @@ -15,7 +15,7 @@ from keystoneclient import exceptions import mock from oslotest import mockpatch -from ceilometer.tests.api import v2 +from ceilometer.tests.functional.api import v2 class TestAPIUpgradePath(v2.FunctionalTest): diff --git a/ceilometer/tests/api/v2/test_app.py b/ceilometer/tests/functional/api/v2/test_app.py similarity index 99% rename from ceilometer/tests/api/v2/test_app.py rename to ceilometer/tests/functional/api/v2/test_app.py index 6a702e9d03..032b89089b 100644 --- a/ceilometer/tests/api/v2/test_app.py +++ b/ceilometer/tests/functional/api/v2/test_app.py @@ -22,7 +22,7 @@ import six import wsme from ceilometer import i18n -from ceilometer.tests.api import v2 +from ceilometer.tests.functional.api import v2 class TestPecanApp(v2.FunctionalTest): diff --git a/ceilometer/tests/api/v2/test_capabilities.py b/ceilometer/tests/functional/api/v2/test_capabilities.py similarity index 95% rename from ceilometer/tests/api/v2/test_capabilities.py rename to ceilometer/tests/functional/api/v2/test_capabilities.py index d25b386183..e6885a3632 100644 --- a/ceilometer/tests/api/v2/test_capabilities.py +++ b/ceilometer/tests/functional/api/v2/test_capabilities.py @@ -17,8 +17,8 @@ import testscenarios -from ceilometer.tests.api import v2 as tests_api from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 as tests_api load_tests = testscenarios.load_tests_apply_scenarios diff --git a/ceilometer/tests/api/v2/test_complex_query_scenarios.py b/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_complex_query_scenarios.py rename to ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py index f2a048a635..95c512cb5b 100644 --- a/ceilometer/tests/api/v2/test_complex_query_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_complex_query_scenarios.py @@ -25,8 +25,8 @@ from oslo_utils import timeutils from ceilometer.alarm.storage import models from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests.api import v2 as tests_api from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 as tests_api admin_header = {"X-Roles": "admin", diff --git a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py b/ceilometer/tests/functional/api/v2/test_compute_duration_by_resource_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py rename to ceilometer/tests/functional/api/v2/test_compute_duration_by_resource_scenarios.py index c6e0add476..19254f2b84 100644 --- a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_compute_duration_by_resource_scenarios.py @@ -21,8 +21,8 @@ import mock from oslo_utils import timeutils from ceilometer.storage import models -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestComputeDurationByResource(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_event_scenarios.py b/ceilometer/tests/functional/api/v2/test_event_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_event_scenarios.py rename to ceilometer/tests/functional/api/v2/test_event_scenarios.py index 74164f44b1..b2bff48fe0 100644 --- a/ceilometer/tests/api/v2/test_event_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_event_scenarios.py @@ -20,8 +20,8 @@ import uuid import webtest.app from ceilometer.event.storage import models -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 headers = {"X-Roles": "admin"} diff --git a/ceilometer/tests/api/v2/test_list_events_scenarios.py b/ceilometer/tests/functional/api/v2/test_list_events_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_list_events_scenarios.py rename to ceilometer/tests/functional/api/v2/test_list_events_scenarios.py index 274d4eeaae..1c3b064445 100644 --- a/ceilometer/tests/api/v2/test_list_events_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_list_events_scenarios.py @@ -23,8 +23,8 @@ import six from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestListEvents(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/functional/api/v2/test_list_meters_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_list_meters_scenarios.py rename to ceilometer/tests/functional/api/v2/test_list_meters_scenarios.py index 0c84167412..fa074dfe31 100644 --- a/ceilometer/tests/api/v2/test_list_meters_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_list_meters_scenarios.py @@ -25,8 +25,8 @@ import webtest.app from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestListEmptyMeters(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_list_resources_scenarios.py b/ceilometer/tests/functional/api/v2/test_list_resources_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_list_resources_scenarios.py rename to ceilometer/tests/functional/api/v2/test_list_resources_scenarios.py index bdcd2fb89a..9354012ecb 100644 --- a/ceilometer/tests/api/v2/test_list_resources_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_list_resources_scenarios.py @@ -23,8 +23,8 @@ import webtest.app from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestListResources(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/functional/api/v2/test_post_samples_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_post_samples_scenarios.py rename to ceilometer/tests/functional/api/v2/test_post_samples_scenarios.py index dd61abc9eb..cc52ff88fb 100644 --- a/ceilometer/tests/api/v2/test_post_samples_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_post_samples_scenarios.py @@ -22,8 +22,8 @@ import mock from oslo_utils import timeutils from oslotest import mockpatch -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestPostSamples(v2.FunctionalTest, diff --git a/ceilometer/tests/api/v2/test_statistics_scenarios.py b/ceilometer/tests/functional/api/v2/test_statistics_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_statistics_scenarios.py rename to ceilometer/tests/functional/api/v2/test_statistics_scenarios.py index ae0c136cdc..18edf8c1ec 100644 --- a/ceilometer/tests/api/v2/test_statistics_scenarios.py +++ b/ceilometer/tests/functional/api/v2/test_statistics_scenarios.py @@ -18,8 +18,8 @@ import datetime from ceilometer.publisher import utils from ceilometer import sample -from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db +from ceilometer.tests.functional.api import v2 class TestMaxProjectVolume(v2.FunctionalTest, diff --git a/ceilometer/tests/agent/__init__.py b/ceilometer/tests/functional/gabbi/__init__.py similarity index 100% rename from ceilometer/tests/agent/__init__.py rename to ceilometer/tests/functional/gabbi/__init__.py diff --git a/ceilometer/tests/gabbi/fixtures.py b/ceilometer/tests/functional/gabbi/fixtures.py similarity index 100% rename from ceilometer/tests/gabbi/fixtures.py rename to ceilometer/tests/functional/gabbi/fixtures.py diff --git a/ceilometer/tests/gabbi/gabbits/alarms.yaml b/ceilometer/tests/functional/gabbi/gabbits/alarms.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/alarms.yaml rename to ceilometer/tests/functional/gabbi/gabbits/alarms.yaml diff --git a/ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml b/ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml rename to ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml diff --git a/ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml b/ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml rename to ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml diff --git a/ceilometer/tests/gabbi/gabbits/basic.yaml b/ceilometer/tests/functional/gabbi/gabbits/basic.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/basic.yaml rename to ceilometer/tests/functional/gabbi/gabbits/basic.yaml diff --git a/ceilometer/tests/gabbi/gabbits/capabilities.yaml b/ceilometer/tests/functional/gabbi/gabbits/capabilities.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/capabilities.yaml rename to ceilometer/tests/functional/gabbi/gabbits/capabilities.yaml diff --git a/ceilometer/tests/gabbi/gabbits/clean-samples.yaml b/ceilometer/tests/functional/gabbi/gabbits/clean-samples.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/clean-samples.yaml rename to ceilometer/tests/functional/gabbi/gabbits/clean-samples.yaml diff --git a/ceilometer/tests/gabbi/gabbits/fixture-samples.yaml b/ceilometer/tests/functional/gabbi/gabbits/fixture-samples.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/fixture-samples.yaml rename to ceilometer/tests/functional/gabbi/gabbits/fixture-samples.yaml diff --git a/ceilometer/tests/gabbi/gabbits/meters.yaml b/ceilometer/tests/functional/gabbi/gabbits/meters.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/meters.yaml rename to ceilometer/tests/functional/gabbi/gabbits/meters.yaml diff --git a/ceilometer/tests/gabbi/gabbits/resources-empty.yaml b/ceilometer/tests/functional/gabbi/gabbits/resources-empty.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/resources-empty.yaml rename to ceilometer/tests/functional/gabbi/gabbits/resources-empty.yaml diff --git a/ceilometer/tests/gabbi/gabbits/resources-fixtured.yaml b/ceilometer/tests/functional/gabbi/gabbits/resources-fixtured.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/resources-fixtured.yaml rename to ceilometer/tests/functional/gabbi/gabbits/resources-fixtured.yaml diff --git a/ceilometer/tests/gabbi/gabbits/samples.yaml b/ceilometer/tests/functional/gabbi/gabbits/samples.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/samples.yaml rename to ceilometer/tests/functional/gabbi/gabbits/samples.yaml diff --git a/ceilometer/tests/gabbi/gabbits_prefix/api_events_with_data.yaml b/ceilometer/tests/functional/gabbi/gabbits_prefix/api_events_with_data.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits_prefix/api_events_with_data.yaml rename to ceilometer/tests/functional/gabbi/gabbits_prefix/api_events_with_data.yaml diff --git a/ceilometer/tests/gabbi/gabbits_prefix/basic.yaml b/ceilometer/tests/functional/gabbi/gabbits_prefix/basic.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits_prefix/basic.yaml rename to ceilometer/tests/functional/gabbi/gabbits_prefix/basic.yaml diff --git a/ceilometer/tests/gabbi/gabbits_prefix/clean-samples.yaml b/ceilometer/tests/functional/gabbi/gabbits_prefix/clean-samples.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits_prefix/clean-samples.yaml rename to ceilometer/tests/functional/gabbi/gabbits_prefix/clean-samples.yaml diff --git a/ceilometer/tests/gabbi/gabbits_prefix/resources-fixtured.yaml b/ceilometer/tests/functional/gabbi/gabbits_prefix/resources-fixtured.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits_prefix/resources-fixtured.yaml rename to ceilometer/tests/functional/gabbi/gabbits_prefix/resources-fixtured.yaml diff --git a/ceilometer/tests/gabbi/test_gabbi.py b/ceilometer/tests/functional/gabbi/test_gabbi.py similarity index 94% rename from ceilometer/tests/gabbi/test_gabbi.py rename to ceilometer/tests/functional/gabbi/test_gabbi.py index e4c256a8fe..881c07fb47 100644 --- a/ceilometer/tests/gabbi/test_gabbi.py +++ b/ceilometer/tests/functional/gabbi/test_gabbi.py @@ -23,8 +23,7 @@ import os from gabbi import driver from ceilometer.api import app -from ceilometer.tests.gabbi import fixtures as fixture_module - +from ceilometer.tests.functional.gabbi import fixtures as fixture_module TESTS_DIR = 'gabbits' diff --git a/ceilometer/tests/gabbi/test_gabbi_prefix.py b/ceilometer/tests/functional/gabbi/test_gabbi_prefix.py similarity index 94% rename from ceilometer/tests/gabbi/test_gabbi_prefix.py rename to ceilometer/tests/functional/gabbi/test_gabbi_prefix.py index ae7045b122..e834e101a8 100644 --- a/ceilometer/tests/gabbi/test_gabbi_prefix.py +++ b/ceilometer/tests/functional/gabbi/test_gabbi_prefix.py @@ -20,8 +20,7 @@ import os from gabbi import driver from ceilometer.api import app -from ceilometer.tests.gabbi import fixtures as fixture_module - +from ceilometer.tests.functional.gabbi import fixtures as fixture_module TESTS_DIR = 'gabbits_prefix' diff --git a/ceilometer/tests/functional/hooks/post_test_hook.sh b/ceilometer/tests/functional/hooks/post_test_hook.sh old mode 100644 new mode 100755 index dce23bd569..b1fc29691a --- a/ceilometer/tests/functional/hooks/post_test_hook.sh +++ b/ceilometer/tests/functional/hooks/post_test_hook.sh @@ -31,14 +31,18 @@ export CEILOMETER_DIR="$BASE/new/ceilometer" # Go to the ceilometer dir cd $CEILOMETER_DIR -sudo chown -R jenkins:stack $CEILOMETER_DIR +if [[ -z "$STACK_USER" ]]; then + export STACK_USER=stack +fi + +sudo chown -R $STACK_USER:stack $CEILOMETER_DIR # Run tests echo "Running ceilometer functional test suite" set +e # NOTE(ityaptin) Expected a script param which contains a backend name -CEILOMETER_TEST_BACKEND="$1" sudo -E -H -u jenkins tox -efunctional +CEILOMETER_TEST_BACKEND="$1" sudo -E -H -u ${STACK_USER:-${USER}} tox -efunctional EXIT_CODE=$? set -e diff --git a/ceilometer/tests/alarm/__init__.py b/ceilometer/tests/functional/publisher/__init__.py similarity index 100% rename from ceilometer/tests/alarm/__init__.py rename to ceilometer/tests/functional/publisher/__init__.py diff --git a/ceilometer/tests/publisher/test_direct.py b/ceilometer/tests/functional/publisher/test_direct.py similarity index 100% rename from ceilometer/tests/publisher/test_direct.py rename to ceilometer/tests/functional/publisher/test_direct.py diff --git a/ceilometer/tests/alarm/evaluator/__init__.py b/ceilometer/tests/functional/storage/__init__.py similarity index 100% rename from ceilometer/tests/alarm/evaluator/__init__.py rename to ceilometer/tests/functional/storage/__init__.py diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/functional/storage/test_impl_db2.py similarity index 100% rename from ceilometer/tests/storage/test_impl_db2.py rename to ceilometer/tests/functional/storage/test_impl_db2.py diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/ceilometer/tests/functional/storage/test_impl_hbase.py similarity index 100% rename from ceilometer/tests/storage/test_impl_hbase.py rename to ceilometer/tests/functional/storage/test_impl_hbase.py diff --git a/ceilometer/tests/storage/test_impl_log.py b/ceilometer/tests/functional/storage/test_impl_log.py similarity index 100% rename from ceilometer/tests/storage/test_impl_log.py rename to ceilometer/tests/functional/storage/test_impl_log.py diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/ceilometer/tests/functional/storage/test_impl_mongodb.py similarity index 100% rename from ceilometer/tests/storage/test_impl_mongodb.py rename to ceilometer/tests/functional/storage/test_impl_mongodb.py diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/functional/storage/test_impl_sqlalchemy.py similarity index 98% rename from ceilometer/tests/storage/test_impl_sqlalchemy.py rename to ceilometer/tests/functional/storage/test_impl_sqlalchemy.py index a4b459d55a..6ce0cfc75b 100644 --- a/ceilometer/tests/storage/test_impl_sqlalchemy.py +++ b/ceilometer/tests/functional/storage/test_impl_sqlalchemy.py @@ -19,10 +19,10 @@ """ import datetime -from six.moves import reprlib import mock from oslo_utils import timeutils +from six.moves import reprlib from ceilometer.alarm.storage import impl_sqlalchemy as impl_sqla_alarm from ceilometer.event.storage import impl_sqlalchemy as impl_sqla_event @@ -31,7 +31,8 @@ from ceilometer.storage import impl_sqlalchemy from ceilometer.storage.sqlalchemy import models as sql_models from ceilometer.tests import base as test_base from ceilometer.tests import db as tests_db -from ceilometer.tests.storage import test_storage_scenarios as scenarios +from ceilometer.tests.functional.storage \ + import test_storage_scenarios as scenarios @tests_db.run_with('sqlite', 'mysql', 'pgsql') diff --git a/ceilometer/tests/storage/test_pymongo_base.py b/ceilometer/tests/functional/storage/test_pymongo_base.py similarity index 98% rename from ceilometer/tests/storage/test_pymongo_base.py rename to ceilometer/tests/functional/storage/test_pymongo_base.py index 56d06c6453..4d29b5d7ab 100644 --- a/ceilometer/tests/storage/test_pymongo_base.py +++ b/ceilometer/tests/functional/storage/test_pymongo_base.py @@ -21,7 +21,7 @@ from ceilometer.publisher import utils from ceilometer import sample from ceilometer.tests import constants from ceilometer.tests import db as tests_db -from ceilometer.tests.storage import test_storage_scenarios +from ceilometer.tests.functional.storage import test_storage_scenarios @tests_db.run_with('mongodb', 'db2') diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/functional/storage/test_storage_scenarios.py similarity index 100% rename from ceilometer/tests/storage/test_storage_scenarios.py rename to ceilometer/tests/functional/storage/test_storage_scenarios.py diff --git a/ceilometer/tests/test_bin.py b/ceilometer/tests/functional/test_bin.py similarity index 100% rename from ceilometer/tests/test_bin.py rename to ceilometer/tests/functional/test_bin.py diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/functional/test_collector.py similarity index 100% rename from ceilometer/tests/test_collector.py rename to ceilometer/tests/functional/test_collector.py diff --git a/ceilometer/tests/functional/test_empty.py b/ceilometer/tests/functional/test_empty.py deleted file mode 100644 index 043eaa6bde..0000000000 --- a/ceilometer/tests/functional/test_empty.py +++ /dev/null @@ -1,23 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" This test is written to avoid failing running the functional test job -caused by `subunit-trace -f` with empty testr output -in ./tools/pretty-tox.sh""" - -from oslotest import base - - -class TestEmpty(base.BaseTestCase): - def test_empty(self): - pass diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/functional/test_notification.py similarity index 100% rename from ceilometer/tests/test_notification.py rename to ceilometer/tests/functional/test_notification.py diff --git a/ceilometer/tests/compute/__init__.py b/ceilometer/tests/unit/__init__.py similarity index 100% rename from ceilometer/tests/compute/__init__.py rename to ceilometer/tests/unit/__init__.py diff --git a/ceilometer/tests/compute/notifications/__init__.py b/ceilometer/tests/unit/agent/__init__.py similarity index 100% rename from ceilometer/tests/compute/notifications/__init__.py rename to ceilometer/tests/unit/agent/__init__.py diff --git a/ceilometer/tests/agent/agentbase.py b/ceilometer/tests/unit/agent/agentbase.py similarity index 100% rename from ceilometer/tests/agent/agentbase.py rename to ceilometer/tests/unit/agent/agentbase.py diff --git a/ceilometer/tests/agent/test_discovery.py b/ceilometer/tests/unit/agent/test_discovery.py similarity index 100% rename from ceilometer/tests/agent/test_discovery.py rename to ceilometer/tests/unit/agent/test_discovery.py diff --git a/ceilometer/tests/agent/test_manager.py b/ceilometer/tests/unit/agent/test_manager.py similarity index 99% rename from ceilometer/tests/agent/test_manager.py rename to ceilometer/tests/unit/agent/test_manager.py index 1a6b5f6d84..d6f8f5091f 100644 --- a/ceilometer/tests/agent/test_manager.py +++ b/ceilometer/tests/unit/agent/test_manager.py @@ -32,7 +32,7 @@ from ceilometer.agent import base as agent_base from ceilometer.agent import manager from ceilometer.agent import plugin_base from ceilometer import pipeline -from ceilometer.tests.agent import agentbase +from ceilometer.tests.unit.agent import agentbase class PollingException(Exception): diff --git a/ceilometer/tests/agent/test_plugin.py b/ceilometer/tests/unit/agent/test_plugin.py similarity index 100% rename from ceilometer/tests/agent/test_plugin.py rename to ceilometer/tests/unit/agent/test_plugin.py diff --git a/ceilometer/tests/compute/pollsters/__init__.py b/ceilometer/tests/unit/alarm/__init__.py similarity index 100% rename from ceilometer/tests/compute/pollsters/__init__.py rename to ceilometer/tests/unit/alarm/__init__.py diff --git a/ceilometer/tests/compute/virt/__init__.py b/ceilometer/tests/unit/alarm/evaluator/__init__.py similarity index 100% rename from ceilometer/tests/compute/virt/__init__.py rename to ceilometer/tests/unit/alarm/evaluator/__init__.py diff --git a/ceilometer/tests/alarm/evaluator/base.py b/ceilometer/tests/unit/alarm/evaluator/base.py similarity index 100% rename from ceilometer/tests/alarm/evaluator/base.py rename to ceilometer/tests/unit/alarm/evaluator/base.py diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/ceilometer/tests/unit/alarm/evaluator/test_base.py similarity index 100% rename from ceilometer/tests/alarm/evaluator/test_base.py rename to ceilometer/tests/unit/alarm/evaluator/test_base.py diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/unit/alarm/evaluator/test_combination.py similarity index 99% rename from ceilometer/tests/alarm/evaluator/test_combination.py rename to ceilometer/tests/unit/alarm/evaluator/test_combination.py index 4b4bcac04b..b7cdd6ee37 100644 --- a/ceilometer/tests/alarm/evaluator/test_combination.py +++ b/ceilometer/tests/unit/alarm/evaluator/test_combination.py @@ -29,8 +29,8 @@ import pytz from ceilometer.alarm.evaluator import combination from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base from ceilometer.tests import constants +from ceilometer.tests.unit.alarm.evaluator import base class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/evaluator/test_gnocchi.py b/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py similarity index 99% rename from ceilometer/tests/alarm/evaluator/test_gnocchi.py rename to ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py index 5cefbc184a..ea60b6a91d 100644 --- a/ceilometer/tests/alarm/evaluator/test_gnocchi.py +++ b/ceilometer/tests/unit/alarm/evaluator/test_gnocchi.py @@ -27,8 +27,8 @@ from six import moves from ceilometer.alarm.evaluator import gnocchi from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base from ceilometer.tests import constants +from ceilometer.tests.unit.alarm.evaluator import base class FakeResponse(object): diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/unit/alarm/evaluator/test_threshold.py similarity index 99% rename from ceilometer/tests/alarm/evaluator/test_threshold.py rename to ceilometer/tests/unit/alarm/evaluator/test_threshold.py index 7e33b07487..9b59008bbb 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/unit/alarm/evaluator/test_threshold.py @@ -27,8 +27,8 @@ from six import moves from ceilometer.alarm.evaluator import threshold from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base from ceilometer.tests import constants +from ceilometer.tests.unit.alarm.evaluator import base class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/test_alarm_svc.py b/ceilometer/tests/unit/alarm/test_alarm_svc.py similarity index 100% rename from ceilometer/tests/alarm/test_alarm_svc.py rename to ceilometer/tests/unit/alarm/test_alarm_svc.py diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/unit/alarm/test_notifier.py similarity index 100% rename from ceilometer/tests/alarm/test_notifier.py rename to ceilometer/tests/unit/alarm/test_notifier.py diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/unit/alarm/test_rpc.py similarity index 100% rename from ceilometer/tests/alarm/test_rpc.py rename to ceilometer/tests/unit/alarm/test_rpc.py diff --git a/ceilometer/tests/compute/virt/hyperv/__init__.py b/ceilometer/tests/unit/api/__init__.py similarity index 100% rename from ceilometer/tests/compute/virt/hyperv/__init__.py rename to ceilometer/tests/unit/api/__init__.py diff --git a/ceilometer/tests/api/test_app.py b/ceilometer/tests/unit/api/test_app.py similarity index 100% rename from ceilometer/tests/api/test_app.py rename to ceilometer/tests/unit/api/test_app.py diff --git a/ceilometer/tests/api/test_hooks.py b/ceilometer/tests/unit/api/test_hooks.py similarity index 100% rename from ceilometer/tests/api/test_hooks.py rename to ceilometer/tests/unit/api/test_hooks.py diff --git a/ceilometer/tests/api/test_versions.py b/ceilometer/tests/unit/api/test_versions.py similarity index 97% rename from ceilometer/tests/api/test_versions.py rename to ceilometer/tests/unit/api/test_versions.py index 1bc21f25e4..44bb97ce9e 100644 --- a/ceilometer/tests/api/test_versions.py +++ b/ceilometer/tests/unit/api/test_versions.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ceilometer.tests import api +from ceilometer.tests.functional import api V2_MEDIA_TYPES = [ { diff --git a/ceilometer/tests/compute/virt/libvirt/__init__.py b/ceilometer/tests/unit/api/v2/__init__.py similarity index 100% rename from ceilometer/tests/compute/virt/libvirt/__init__.py rename to ceilometer/tests/unit/api/v2/__init__.py diff --git a/ceilometer/tests/api/v2/test_complex_query.py b/ceilometer/tests/unit/api/v2/test_complex_query.py similarity index 100% rename from ceilometer/tests/api/v2/test_complex_query.py rename to ceilometer/tests/unit/api/v2/test_complex_query.py diff --git a/ceilometer/tests/api/v2/test_query.py b/ceilometer/tests/unit/api/v2/test_query.py similarity index 100% rename from ceilometer/tests/api/v2/test_query.py rename to ceilometer/tests/unit/api/v2/test_query.py diff --git a/ceilometer/tests/api/v2/test_statistics.py b/ceilometer/tests/unit/api/v2/test_statistics.py similarity index 100% rename from ceilometer/tests/api/v2/test_statistics.py rename to ceilometer/tests/unit/api/v2/test_statistics.py diff --git a/ceilometer/tests/api/v2/test_wsme_custom_type.py b/ceilometer/tests/unit/api/v2/test_wsme_custom_type.py similarity index 100% rename from ceilometer/tests/api/v2/test_wsme_custom_type.py rename to ceilometer/tests/unit/api/v2/test_wsme_custom_type.py diff --git a/ceilometer/tests/compute/virt/vmware/__init__.py b/ceilometer/tests/unit/compute/__init__.py similarity index 100% rename from ceilometer/tests/compute/virt/vmware/__init__.py rename to ceilometer/tests/unit/compute/__init__.py diff --git a/ceilometer/tests/compute/virt/xenapi/__init__.py b/ceilometer/tests/unit/compute/notifications/__init__.py similarity index 100% rename from ceilometer/tests/compute/virt/xenapi/__init__.py rename to ceilometer/tests/unit/compute/notifications/__init__.py diff --git a/ceilometer/tests/compute/notifications/test_cpu.py b/ceilometer/tests/unit/compute/notifications/test_cpu.py similarity index 100% rename from ceilometer/tests/compute/notifications/test_cpu.py rename to ceilometer/tests/unit/compute/notifications/test_cpu.py diff --git a/ceilometer/tests/compute/notifications/test_instance.py b/ceilometer/tests/unit/compute/notifications/test_instance.py similarity index 100% rename from ceilometer/tests/compute/notifications/test_instance.py rename to ceilometer/tests/unit/compute/notifications/test_instance.py diff --git a/ceilometer/tests/data_processing/__init__.py b/ceilometer/tests/unit/compute/pollsters/__init__.py similarity index 100% rename from ceilometer/tests/data_processing/__init__.py rename to ceilometer/tests/unit/compute/pollsters/__init__.py diff --git a/ceilometer/tests/compute/pollsters/base.py b/ceilometer/tests/unit/compute/pollsters/base.py similarity index 100% rename from ceilometer/tests/compute/pollsters/base.py rename to ceilometer/tests/unit/compute/pollsters/base.py diff --git a/ceilometer/tests/compute/pollsters/test_cpu.py b/ceilometer/tests/unit/compute/pollsters/test_cpu.py similarity index 98% rename from ceilometer/tests/compute/pollsters/test_cpu.py rename to ceilometer/tests/unit/compute/pollsters/test_cpu.py index ceda7835d5..bfc3f7296a 100644 --- a/ceilometer/tests/compute/pollsters/test_cpu.py +++ b/ceilometer/tests/unit/compute/pollsters/test_cpu.py @@ -21,7 +21,7 @@ import mock from ceilometer.agent import manager from ceilometer.compute.pollsters import cpu from ceilometer.compute.virt import inspector as virt_inspector -from ceilometer.tests.compute.pollsters import base +from ceilometer.tests.unit.compute.pollsters import base class TestCPUPollster(base.TestPollsterBase): diff --git a/ceilometer/tests/compute/pollsters/test_diskio.py b/ceilometer/tests/unit/compute/pollsters/test_diskio.py similarity index 100% rename from ceilometer/tests/compute/pollsters/test_diskio.py rename to ceilometer/tests/unit/compute/pollsters/test_diskio.py diff --git a/ceilometer/tests/compute/pollsters/test_instance.py b/ceilometer/tests/unit/compute/pollsters/test_instance.py similarity index 98% rename from ceilometer/tests/compute/pollsters/test_instance.py rename to ceilometer/tests/unit/compute/pollsters/test_instance.py index eaa144d223..3cd852571a 100644 --- a/ceilometer/tests/compute/pollsters/test_instance.py +++ b/ceilometer/tests/unit/compute/pollsters/test_instance.py @@ -19,7 +19,7 @@ from oslo_config import fixture as fixture_config from ceilometer.agent import manager from ceilometer.compute.pollsters import instance as pollsters_instance -from ceilometer.tests.compute.pollsters import base +from ceilometer.tests.unit.compute.pollsters import base class TestInstancePollster(base.TestPollsterBase): diff --git a/ceilometer/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/unit/compute/pollsters/test_location_metadata.py similarity index 100% rename from ceilometer/tests/compute/pollsters/test_location_metadata.py rename to ceilometer/tests/unit/compute/pollsters/test_location_metadata.py diff --git a/ceilometer/tests/compute/pollsters/test_memory.py b/ceilometer/tests/unit/compute/pollsters/test_memory.py similarity index 98% rename from ceilometer/tests/compute/pollsters/test_memory.py rename to ceilometer/tests/unit/compute/pollsters/test_memory.py index d509206398..ff296a1050 100644 --- a/ceilometer/tests/compute/pollsters/test_memory.py +++ b/ceilometer/tests/unit/compute/pollsters/test_memory.py @@ -18,7 +18,7 @@ import mock from ceilometer.agent import manager from ceilometer.compute.pollsters import memory from ceilometer.compute.virt import inspector as virt_inspector -from ceilometer.tests.compute.pollsters import base +from ceilometer.tests.unit.compute.pollsters import base class TestMemoryPollster(base.TestPollsterBase): diff --git a/ceilometer/tests/compute/pollsters/test_net.py b/ceilometer/tests/unit/compute/pollsters/test_net.py similarity index 99% rename from ceilometer/tests/compute/pollsters/test_net.py rename to ceilometer/tests/unit/compute/pollsters/test_net.py index 9f086a2485..e99ee79df6 100644 --- a/ceilometer/tests/compute/pollsters/test_net.py +++ b/ceilometer/tests/unit/compute/pollsters/test_net.py @@ -20,7 +20,7 @@ from ceilometer.agent import manager from ceilometer.compute.pollsters import net from ceilometer.compute.virt import inspector as virt_inspector from ceilometer import sample -from ceilometer.tests.compute.pollsters import base +from ceilometer.tests.unit.compute.pollsters import base class FauxInstance(object): diff --git a/ceilometer/tests/database/__init__.py b/ceilometer/tests/unit/compute/virt/__init__.py similarity index 100% rename from ceilometer/tests/database/__init__.py rename to ceilometer/tests/unit/compute/virt/__init__.py diff --git a/ceilometer/tests/dispatcher/__init__.py b/ceilometer/tests/unit/compute/virt/hyperv/__init__.py similarity index 100% rename from ceilometer/tests/dispatcher/__init__.py rename to ceilometer/tests/unit/compute/virt/hyperv/__init__.py diff --git a/ceilometer/tests/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py similarity index 100% rename from ceilometer/tests/compute/virt/hyperv/test_inspector.py rename to ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py diff --git a/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py b/ceilometer/tests/unit/compute/virt/hyperv/test_utilsv2.py similarity index 100% rename from ceilometer/tests/compute/virt/hyperv/test_utilsv2.py rename to ceilometer/tests/unit/compute/virt/hyperv/test_utilsv2.py diff --git a/ceilometer/tests/dns/__init__.py b/ceilometer/tests/unit/compute/virt/libvirt/__init__.py similarity index 100% rename from ceilometer/tests/dns/__init__.py rename to ceilometer/tests/unit/compute/virt/libvirt/__init__.py diff --git a/ceilometer/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py similarity index 100% rename from ceilometer/tests/compute/virt/libvirt/test_inspector.py rename to ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py diff --git a/ceilometer/tests/energy/__init__.py b/ceilometer/tests/unit/compute/virt/vmware/__init__.py similarity index 100% rename from ceilometer/tests/energy/__init__.py rename to ceilometer/tests/unit/compute/virt/vmware/__init__.py diff --git a/ceilometer/tests/compute/virt/vmware/test_inspector.py b/ceilometer/tests/unit/compute/virt/vmware/test_inspector.py similarity index 100% rename from ceilometer/tests/compute/virt/vmware/test_inspector.py rename to ceilometer/tests/unit/compute/virt/vmware/test_inspector.py diff --git a/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py b/ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.py similarity index 100% rename from ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py rename to ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.py diff --git a/ceilometer/tests/event/__init__.py b/ceilometer/tests/unit/compute/virt/xenapi/__init__.py similarity index 100% rename from ceilometer/tests/event/__init__.py rename to ceilometer/tests/unit/compute/virt/xenapi/__init__.py diff --git a/ceilometer/tests/compute/virt/xenapi/test_inspector.py b/ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py similarity index 100% rename from ceilometer/tests/compute/virt/xenapi/test_inspector.py rename to ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py diff --git a/ceilometer/tests/gabbi/__init__.py b/ceilometer/tests/unit/data_processing/__init__.py similarity index 100% rename from ceilometer/tests/gabbi/__init__.py rename to ceilometer/tests/unit/data_processing/__init__.py diff --git a/ceilometer/tests/data_processing/test_notifications.py b/ceilometer/tests/unit/data_processing/test_notifications.py similarity index 100% rename from ceilometer/tests/data_processing/test_notifications.py rename to ceilometer/tests/unit/data_processing/test_notifications.py diff --git a/ceilometer/tests/hardware/__init__.py b/ceilometer/tests/unit/database/__init__.py similarity index 100% rename from ceilometer/tests/hardware/__init__.py rename to ceilometer/tests/unit/database/__init__.py diff --git a/ceilometer/tests/database/test_notifications.py b/ceilometer/tests/unit/database/test_notifications.py similarity index 100% rename from ceilometer/tests/database/test_notifications.py rename to ceilometer/tests/unit/database/test_notifications.py diff --git a/ceilometer/tests/hardware/inspector/__init__.py b/ceilometer/tests/unit/dispatcher/__init__.py similarity index 100% rename from ceilometer/tests/hardware/inspector/__init__.py rename to ceilometer/tests/unit/dispatcher/__init__.py diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/unit/dispatcher/test_db.py similarity index 100% rename from ceilometer/tests/dispatcher/test_db.py rename to ceilometer/tests/unit/dispatcher/test_db.py diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/unit/dispatcher/test_file.py similarity index 100% rename from ceilometer/tests/dispatcher/test_file.py rename to ceilometer/tests/unit/dispatcher/test_file.py diff --git a/ceilometer/tests/dispatcher/test_gnocchi.py b/ceilometer/tests/unit/dispatcher/test_gnocchi.py similarity index 100% rename from ceilometer/tests/dispatcher/test_gnocchi.py rename to ceilometer/tests/unit/dispatcher/test_gnocchi.py diff --git a/ceilometer/tests/dispatcher/test_http.py b/ceilometer/tests/unit/dispatcher/test_http.py similarity index 100% rename from ceilometer/tests/dispatcher/test_http.py rename to ceilometer/tests/unit/dispatcher/test_http.py diff --git a/ceilometer/tests/hardware/pollsters/__init__.py b/ceilometer/tests/unit/dns/__init__.py similarity index 100% rename from ceilometer/tests/hardware/pollsters/__init__.py rename to ceilometer/tests/unit/dns/__init__.py diff --git a/ceilometer/tests/dns/test_notifications.py b/ceilometer/tests/unit/dns/test_notifications.py similarity index 100% rename from ceilometer/tests/dns/test_notifications.py rename to ceilometer/tests/unit/dns/test_notifications.py diff --git a/ceilometer/tests/identity/__init__.py b/ceilometer/tests/unit/energy/__init__.py similarity index 100% rename from ceilometer/tests/identity/__init__.py rename to ceilometer/tests/unit/energy/__init__.py diff --git a/ceilometer/tests/energy/test_kwapi.py b/ceilometer/tests/unit/energy/test_kwapi.py similarity index 100% rename from ceilometer/tests/energy/test_kwapi.py rename to ceilometer/tests/unit/energy/test_kwapi.py diff --git a/ceilometer/tests/image/__init__.py b/ceilometer/tests/unit/event/__init__.py similarity index 100% rename from ceilometer/tests/image/__init__.py rename to ceilometer/tests/unit/event/__init__.py diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/unit/event/test_converter.py similarity index 100% rename from ceilometer/tests/event/test_converter.py rename to ceilometer/tests/unit/event/test_converter.py diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/unit/event/test_endpoint.py similarity index 100% rename from ceilometer/tests/event/test_endpoint.py rename to ceilometer/tests/unit/event/test_endpoint.py diff --git a/ceilometer/tests/event/test_trait_plugins.py b/ceilometer/tests/unit/event/test_trait_plugins.py similarity index 100% rename from ceilometer/tests/event/test_trait_plugins.py rename to ceilometer/tests/unit/event/test_trait_plugins.py diff --git a/ceilometer/tests/ipmi/__init__.py b/ceilometer/tests/unit/hardware/__init__.py similarity index 100% rename from ceilometer/tests/ipmi/__init__.py rename to ceilometer/tests/unit/hardware/__init__.py diff --git a/ceilometer/tests/ipmi/notifications/__init__.py b/ceilometer/tests/unit/hardware/inspector/__init__.py similarity index 100% rename from ceilometer/tests/ipmi/notifications/__init__.py rename to ceilometer/tests/unit/hardware/inspector/__init__.py diff --git a/ceilometer/tests/hardware/inspector/test_inspector.py b/ceilometer/tests/unit/hardware/inspector/test_inspector.py similarity index 100% rename from ceilometer/tests/hardware/inspector/test_inspector.py rename to ceilometer/tests/unit/hardware/inspector/test_inspector.py diff --git a/ceilometer/tests/hardware/inspector/test_snmp.py b/ceilometer/tests/unit/hardware/inspector/test_snmp.py similarity index 100% rename from ceilometer/tests/hardware/inspector/test_snmp.py rename to ceilometer/tests/unit/hardware/inspector/test_snmp.py diff --git a/ceilometer/tests/ipmi/platform/__init__.py b/ceilometer/tests/unit/hardware/pollsters/__init__.py similarity index 100% rename from ceilometer/tests/ipmi/platform/__init__.py rename to ceilometer/tests/unit/hardware/pollsters/__init__.py diff --git a/ceilometer/tests/hardware/pollsters/base.py b/ceilometer/tests/unit/hardware/pollsters/base.py similarity index 100% rename from ceilometer/tests/hardware/pollsters/base.py rename to ceilometer/tests/unit/hardware/pollsters/base.py diff --git a/ceilometer/tests/hardware/pollsters/test_cpu.py b/ceilometer/tests/unit/hardware/pollsters/test_cpu.py similarity index 96% rename from ceilometer/tests/hardware/pollsters/test_cpu.py rename to ceilometer/tests/unit/hardware/pollsters/test_cpu.py index c106282346..4dd4604a99 100644 --- a/ceilometer/tests/hardware/pollsters/test_cpu.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_cpu.py @@ -17,7 +17,7 @@ from ceilometer.hardware.pollsters import cpu from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestCPUPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_disk.py b/ceilometer/tests/unit/hardware/pollsters/test_disk.py similarity index 95% rename from ceilometer/tests/hardware/pollsters/test_disk.py rename to ceilometer/tests/unit/hardware/pollsters/test_disk.py index 55b4632319..00aa81165b 100644 --- a/ceilometer/tests/hardware/pollsters/test_disk.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_disk.py @@ -17,7 +17,7 @@ from ceilometer.hardware.pollsters import disk from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestDiskPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_memory.py b/ceilometer/tests/unit/hardware/pollsters/test_memory.py similarity index 96% rename from ceilometer/tests/hardware/pollsters/test_memory.py rename to ceilometer/tests/unit/hardware/pollsters/test_memory.py index 5e511bcc67..449569c092 100644 --- a/ceilometer/tests/hardware/pollsters/test_memory.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_memory.py @@ -17,7 +17,7 @@ from ceilometer.hardware.pollsters import memory from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestMemoryPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_net.py b/ceilometer/tests/unit/hardware/pollsters/test_net.py similarity index 96% rename from ceilometer/tests/hardware/pollsters/test_net.py rename to ceilometer/tests/unit/hardware/pollsters/test_net.py index e229bd491a..73f851b71c 100644 --- a/ceilometer/tests/hardware/pollsters/test_net.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_net.py @@ -17,7 +17,7 @@ from ceilometer.hardware.pollsters import net from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestNetPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_network_aggregated.py b/ceilometer/tests/unit/hardware/pollsters/test_network_aggregated.py similarity index 95% rename from ceilometer/tests/hardware/pollsters/test_network_aggregated.py rename to ceilometer/tests/unit/hardware/pollsters/test_network_aggregated.py index 43885e41a8..0255d8f4b7 100644 --- a/ceilometer/tests/hardware/pollsters/test_network_aggregated.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_network_aggregated.py @@ -12,7 +12,7 @@ from ceilometer.hardware.pollsters import network_aggregated from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestNetworkAggregatedPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_system.py b/ceilometer/tests/unit/hardware/pollsters/test_system.py similarity index 96% rename from ceilometer/tests/hardware/pollsters/test_system.py rename to ceilometer/tests/unit/hardware/pollsters/test_system.py index 971e8859ff..29a1f5c768 100644 --- a/ceilometer/tests/hardware/pollsters/test_system.py +++ b/ceilometer/tests/unit/hardware/pollsters/test_system.py @@ -12,7 +12,7 @@ from ceilometer.hardware.pollsters import system from ceilometer import sample -from ceilometer.tests.hardware.pollsters import base +from ceilometer.tests.unit.hardware.pollsters import base class TestSystemPollsters(base.TestPollsterBase): diff --git a/ceilometer/tests/hardware/pollsters/test_util.py b/ceilometer/tests/unit/hardware/pollsters/test_util.py similarity index 100% rename from ceilometer/tests/hardware/pollsters/test_util.py rename to ceilometer/tests/unit/hardware/pollsters/test_util.py diff --git a/ceilometer/tests/ipmi/pollsters/__init__.py b/ceilometer/tests/unit/identity/__init__.py similarity index 100% rename from ceilometer/tests/ipmi/pollsters/__init__.py rename to ceilometer/tests/unit/identity/__init__.py diff --git a/ceilometer/tests/identity/test_notifications.py b/ceilometer/tests/unit/identity/test_notifications.py similarity index 100% rename from ceilometer/tests/identity/test_notifications.py rename to ceilometer/tests/unit/identity/test_notifications.py diff --git a/ceilometer/tests/key_value_storage/__init__.py b/ceilometer/tests/unit/image/__init__.py similarity index 100% rename from ceilometer/tests/key_value_storage/__init__.py rename to ceilometer/tests/unit/image/__init__.py diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/unit/image/test_glance.py similarity index 100% rename from ceilometer/tests/image/test_glance.py rename to ceilometer/tests/unit/image/test_glance.py diff --git a/ceilometer/tests/image/test_notifications.py b/ceilometer/tests/unit/image/test_notifications.py similarity index 100% rename from ceilometer/tests/image/test_notifications.py rename to ceilometer/tests/unit/image/test_notifications.py diff --git a/ceilometer/tests/meter/__init__.py b/ceilometer/tests/unit/ipmi/__init__.py similarity index 100% rename from ceilometer/tests/meter/__init__.py rename to ceilometer/tests/unit/ipmi/__init__.py diff --git a/ceilometer/tests/network/__init__.py b/ceilometer/tests/unit/ipmi/notifications/__init__.py similarity index 100% rename from ceilometer/tests/network/__init__.py rename to ceilometer/tests/unit/ipmi/notifications/__init__.py diff --git a/ceilometer/tests/ipmi/notifications/ipmi_test_data.py b/ceilometer/tests/unit/ipmi/notifications/ipmi_test_data.py similarity index 100% rename from ceilometer/tests/ipmi/notifications/ipmi_test_data.py rename to ceilometer/tests/unit/ipmi/notifications/ipmi_test_data.py diff --git a/ceilometer/tests/ipmi/notifications/test_ironic.py b/ceilometer/tests/unit/ipmi/notifications/test_ironic.py similarity index 99% rename from ceilometer/tests/ipmi/notifications/test_ironic.py rename to ceilometer/tests/unit/ipmi/notifications/test_ironic.py index 3d242062a9..b035785271 100644 --- a/ceilometer/tests/ipmi/notifications/test_ironic.py +++ b/ceilometer/tests/unit/ipmi/notifications/test_ironic.py @@ -20,7 +20,7 @@ from oslotest import base from ceilometer.ipmi.notifications import ironic as ipmi from ceilometer import sample -from ceilometer.tests.ipmi.notifications import ipmi_test_data +from ceilometer.tests.unit.ipmi.notifications import ipmi_test_data class TestNotifications(base.BaseTestCase): diff --git a/ceilometer/tests/network/services/__init__.py b/ceilometer/tests/unit/ipmi/platform/__init__.py similarity index 100% rename from ceilometer/tests/network/services/__init__.py rename to ceilometer/tests/unit/ipmi/platform/__init__.py diff --git a/ceilometer/tests/ipmi/platform/fake_utils.py b/ceilometer/tests/unit/ipmi/platform/fake_utils.py similarity index 97% rename from ceilometer/tests/ipmi/platform/fake_utils.py rename to ceilometer/tests/unit/ipmi/platform/fake_utils.py index e134195bec..a8bed72517 100644 --- a/ceilometer/tests/ipmi/platform/fake_utils.py +++ b/ceilometer/tests/unit/ipmi/platform/fake_utils.py @@ -16,7 +16,7 @@ import binascii from ceilometer.ipmi.platform import exception as nmexcept from ceilometer.ipmi.platform import intel_node_manager as node_manager -from ceilometer.tests.ipmi.platform import ipmitool_test_data as test_data +from ceilometer.tests.unit.ipmi.platform import ipmitool_test_data as test_data def get_sensor_status_init(parameter=''): diff --git a/ceilometer/tests/ipmi/platform/ipmitool_test_data.py b/ceilometer/tests/unit/ipmi/platform/ipmitool_test_data.py similarity index 100% rename from ceilometer/tests/ipmi/platform/ipmitool_test_data.py rename to ceilometer/tests/unit/ipmi/platform/ipmitool_test_data.py diff --git a/ceilometer/tests/ipmi/platform/test_intel_node_manager.py b/ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py similarity index 98% rename from ceilometer/tests/ipmi/platform/test_intel_node_manager.py rename to ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py index e40fa9ea90..25e1d482f1 100644 --- a/ceilometer/tests/ipmi/platform/test_intel_node_manager.py +++ b/ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py @@ -13,15 +13,15 @@ # under the License. import abc + import mock +from oslotest import base import six from ceilometer.ipmi.platform import intel_node_manager as node_manager -from ceilometer.tests.ipmi.platform import fake_utils +from ceilometer.tests.unit.ipmi.platform import fake_utils from ceilometer import utils -from oslotest import base - @six.add_metaclass(abc.ABCMeta) class _Base(base.BaseTestCase): diff --git a/ceilometer/tests/ipmi/platform/test_ipmi_sensor.py b/ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py similarity index 98% rename from ceilometer/tests/ipmi/platform/test_ipmi_sensor.py rename to ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py index a6b284a108..e6eaddea8c 100644 --- a/ceilometer/tests/ipmi/platform/test_ipmi_sensor.py +++ b/ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py @@ -16,7 +16,7 @@ import mock from oslotest import base from ceilometer.ipmi.platform import ipmi_sensor -from ceilometer.tests.ipmi.platform import fake_utils +from ceilometer.tests.unit.ipmi.platform import fake_utils from ceilometer import utils diff --git a/ceilometer/tests/network/statistics/opencontrail/__init__.py b/ceilometer/tests/unit/ipmi/pollsters/__init__.py similarity index 100% rename from ceilometer/tests/network/statistics/opencontrail/__init__.py rename to ceilometer/tests/unit/ipmi/pollsters/__init__.py diff --git a/ceilometer/tests/ipmi/pollsters/base.py b/ceilometer/tests/unit/ipmi/pollsters/base.py similarity index 100% rename from ceilometer/tests/ipmi/pollsters/base.py rename to ceilometer/tests/unit/ipmi/pollsters/base.py diff --git a/ceilometer/tests/ipmi/pollsters/test_node.py b/ceilometer/tests/unit/ipmi/pollsters/test_node.py similarity index 98% rename from ceilometer/tests/ipmi/pollsters/test_node.py rename to ceilometer/tests/unit/ipmi/pollsters/test_node.py index a68dfe36ea..4b3e7c6ac3 100644 --- a/ceilometer/tests/ipmi/pollsters/test_node.py +++ b/ceilometer/tests/unit/ipmi/pollsters/test_node.py @@ -16,8 +16,7 @@ import mock from oslo_config import cfg from ceilometer.ipmi.pollsters import node -from ceilometer.tests.ipmi.pollsters import base - +from ceilometer.tests.unit.ipmi.pollsters import base CONF = cfg.CONF CONF.import_opt('host', 'ceilometer.service') diff --git a/ceilometer/tests/ipmi/pollsters/test_sensor.py b/ceilometer/tests/unit/ipmi/pollsters/test_sensor.py similarity index 97% rename from ceilometer/tests/ipmi/pollsters/test_sensor.py rename to ceilometer/tests/unit/ipmi/pollsters/test_sensor.py index 5405e089de..96f5a3f44c 100644 --- a/ceilometer/tests/ipmi/pollsters/test_sensor.py +++ b/ceilometer/tests/unit/ipmi/pollsters/test_sensor.py @@ -16,9 +16,8 @@ import mock from oslo_config import cfg from ceilometer.ipmi.pollsters import sensor -from ceilometer.tests.ipmi.notifications import ipmi_test_data -from ceilometer.tests.ipmi.pollsters import base - +from ceilometer.tests.unit.ipmi.notifications import ipmi_test_data +from ceilometer.tests.unit.ipmi.pollsters import base CONF = cfg.CONF CONF.import_opt('host', 'ceilometer.service') diff --git a/ceilometer/tests/network/statistics/opendaylight/__init__.py b/ceilometer/tests/unit/key_value_storage/__init__.py similarity index 100% rename from ceilometer/tests/network/statistics/opendaylight/__init__.py rename to ceilometer/tests/unit/key_value_storage/__init__.py diff --git a/ceilometer/tests/key_value_storage/test_notifications.py b/ceilometer/tests/unit/key_value_storage/test_notifications.py similarity index 100% rename from ceilometer/tests/key_value_storage/test_notifications.py rename to ceilometer/tests/unit/key_value_storage/test_notifications.py diff --git a/ceilometer/tests/objectstore/__init__.py b/ceilometer/tests/unit/meter/__init__.py similarity index 100% rename from ceilometer/tests/objectstore/__init__.py rename to ceilometer/tests/unit/meter/__init__.py diff --git a/ceilometer/tests/meter/test_notifications.py b/ceilometer/tests/unit/meter/test_notifications.py similarity index 100% rename from ceilometer/tests/meter/test_notifications.py rename to ceilometer/tests/unit/meter/test_notifications.py diff --git a/ceilometer/tests/orchestration/__init__.py b/ceilometer/tests/unit/network/__init__.py similarity index 100% rename from ceilometer/tests/orchestration/__init__.py rename to ceilometer/tests/unit/network/__init__.py diff --git a/ceilometer/tests/profiler/__init__.py b/ceilometer/tests/unit/network/services/__init__.py similarity index 100% rename from ceilometer/tests/profiler/__init__.py rename to ceilometer/tests/unit/network/services/__init__.py diff --git a/ceilometer/tests/network/services/test_fwaas.py b/ceilometer/tests/unit/network/services/test_fwaas.py similarity index 100% rename from ceilometer/tests/network/services/test_fwaas.py rename to ceilometer/tests/unit/network/services/test_fwaas.py diff --git a/ceilometer/tests/network/services/test_lbaas.py b/ceilometer/tests/unit/network/services/test_lbaas.py similarity index 100% rename from ceilometer/tests/network/services/test_lbaas.py rename to ceilometer/tests/unit/network/services/test_lbaas.py diff --git a/ceilometer/tests/network/services/test_vpnaas.py b/ceilometer/tests/unit/network/services/test_vpnaas.py similarity index 100% rename from ceilometer/tests/network/services/test_vpnaas.py rename to ceilometer/tests/unit/network/services/test_vpnaas.py diff --git a/ceilometer/tests/network/statistics/__init__.py b/ceilometer/tests/unit/network/statistics/__init__.py similarity index 100% rename from ceilometer/tests/network/statistics/__init__.py rename to ceilometer/tests/unit/network/statistics/__init__.py diff --git a/ceilometer/tests/publisher/__init__.py b/ceilometer/tests/unit/network/statistics/opencontrail/__init__.py similarity index 100% rename from ceilometer/tests/publisher/__init__.py rename to ceilometer/tests/unit/network/statistics/opencontrail/__init__.py diff --git a/ceilometer/tests/network/statistics/opencontrail/test_client.py b/ceilometer/tests/unit/network/statistics/opencontrail/test_client.py similarity index 100% rename from ceilometer/tests/network/statistics/opencontrail/test_client.py rename to ceilometer/tests/unit/network/statistics/opencontrail/test_client.py diff --git a/ceilometer/tests/network/statistics/opencontrail/test_driver.py b/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py similarity index 100% rename from ceilometer/tests/network/statistics/opencontrail/test_driver.py rename to ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py diff --git a/ceilometer/tests/storage/__init__.py b/ceilometer/tests/unit/network/statistics/opendaylight/__init__.py similarity index 100% rename from ceilometer/tests/storage/__init__.py rename to ceilometer/tests/unit/network/statistics/opendaylight/__init__.py diff --git a/ceilometer/tests/network/statistics/opendaylight/test_client.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py similarity index 100% rename from ceilometer/tests/network/statistics/opendaylight/test_client.py rename to ceilometer/tests/unit/network/statistics/opendaylight/test_client.py diff --git a/ceilometer/tests/network/statistics/opendaylight/test_driver.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py similarity index 100% rename from ceilometer/tests/network/statistics/opendaylight/test_driver.py rename to ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py diff --git a/ceilometer/tests/network/statistics/test_driver.py b/ceilometer/tests/unit/network/statistics/test_driver.py similarity index 100% rename from ceilometer/tests/network/statistics/test_driver.py rename to ceilometer/tests/unit/network/statistics/test_driver.py diff --git a/ceilometer/tests/network/statistics/test_flow.py b/ceilometer/tests/unit/network/statistics/test_flow.py similarity index 97% rename from ceilometer/tests/network/statistics/test_flow.py rename to ceilometer/tests/unit/network/statistics/test_flow.py index eef773d737..e25b559fa1 100644 --- a/ceilometer/tests/network/statistics/test_flow.py +++ b/ceilometer/tests/unit/network/statistics/test_flow.py @@ -15,7 +15,7 @@ from ceilometer.network.statistics import flow from ceilometer import sample -from ceilometer.tests.network import statistics +from ceilometer.tests.unit.network import statistics class TestFlowPollsters(statistics._PollsterTestBase): diff --git a/ceilometer/tests/network/statistics/test_port.py b/ceilometer/tests/unit/network/statistics/test_port.py similarity index 98% rename from ceilometer/tests/network/statistics/test_port.py rename to ceilometer/tests/unit/network/statistics/test_port.py index c5670d999b..d05f912747 100644 --- a/ceilometer/tests/network/statistics/test_port.py +++ b/ceilometer/tests/unit/network/statistics/test_port.py @@ -15,7 +15,7 @@ from ceilometer.network.statistics import port from ceilometer import sample -from ceilometer.tests.network import statistics +from ceilometer.tests.unit.network import statistics class TestPortPollsters(statistics._PollsterTestBase): diff --git a/ceilometer/tests/network/statistics/test_statistics.py b/ceilometer/tests/unit/network/statistics/test_statistics.py similarity index 100% rename from ceilometer/tests/network/statistics/test_statistics.py rename to ceilometer/tests/unit/network/statistics/test_statistics.py diff --git a/ceilometer/tests/network/statistics/test_switch.py b/ceilometer/tests/unit/network/statistics/test_switch.py similarity index 94% rename from ceilometer/tests/network/statistics/test_switch.py rename to ceilometer/tests/unit/network/statistics/test_switch.py index fb2e162d4c..c532a3f00d 100644 --- a/ceilometer/tests/network/statistics/test_switch.py +++ b/ceilometer/tests/unit/network/statistics/test_switch.py @@ -15,7 +15,7 @@ from ceilometer.network.statistics import switch from ceilometer import sample -from ceilometer.tests.network import statistics +from ceilometer.tests.unit.network import statistics class TestSwitchPollster(statistics._PollsterTestBase): diff --git a/ceilometer/tests/network/statistics/test_table.py b/ceilometer/tests/unit/network/statistics/test_table.py similarity index 96% rename from ceilometer/tests/network/statistics/test_table.py rename to ceilometer/tests/unit/network/statistics/test_table.py index 4ea837267e..533e2a612e 100644 --- a/ceilometer/tests/network/statistics/test_table.py +++ b/ceilometer/tests/unit/network/statistics/test_table.py @@ -15,7 +15,7 @@ from ceilometer.network.statistics import table from ceilometer import sample -from ceilometer.tests.network import statistics +from ceilometer.tests.unit.network import statistics class TestTablePollsters(statistics._PollsterTestBase): diff --git a/ceilometer/tests/network/test_floatingip.py b/ceilometer/tests/unit/network/test_floatingip.py similarity index 100% rename from ceilometer/tests/network/test_floatingip.py rename to ceilometer/tests/unit/network/test_floatingip.py diff --git a/ceilometer/tests/network/test_notifications.py b/ceilometer/tests/unit/network/test_notifications.py similarity index 100% rename from ceilometer/tests/network/test_notifications.py rename to ceilometer/tests/unit/network/test_notifications.py diff --git a/ceilometer/tests/storage/sqlalchemy/__init__.py b/ceilometer/tests/unit/objectstore/__init__.py similarity index 100% rename from ceilometer/tests/storage/sqlalchemy/__init__.py rename to ceilometer/tests/unit/objectstore/__init__.py diff --git a/ceilometer/tests/objectstore/test_notifications.py b/ceilometer/tests/unit/objectstore/test_notifications.py similarity index 100% rename from ceilometer/tests/objectstore/test_notifications.py rename to ceilometer/tests/unit/objectstore/test_notifications.py diff --git a/ceilometer/tests/objectstore/test_rgw.py b/ceilometer/tests/unit/objectstore/test_rgw.py similarity index 100% rename from ceilometer/tests/objectstore/test_rgw.py rename to ceilometer/tests/unit/objectstore/test_rgw.py diff --git a/ceilometer/tests/objectstore/test_rgw_client.py b/ceilometer/tests/unit/objectstore/test_rgw_client.py similarity index 100% rename from ceilometer/tests/objectstore/test_rgw_client.py rename to ceilometer/tests/unit/objectstore/test_rgw_client.py diff --git a/ceilometer/tests/objectstore/test_swift.py b/ceilometer/tests/unit/objectstore/test_swift.py similarity index 100% rename from ceilometer/tests/objectstore/test_swift.py rename to ceilometer/tests/unit/objectstore/test_swift.py diff --git a/ceilometer/tests/telemetry/__init__.py b/ceilometer/tests/unit/orchestration/__init__.py similarity index 100% rename from ceilometer/tests/telemetry/__init__.py rename to ceilometer/tests/unit/orchestration/__init__.py diff --git a/ceilometer/tests/orchestration/test_notifications.py b/ceilometer/tests/unit/orchestration/test_notifications.py similarity index 100% rename from ceilometer/tests/orchestration/test_notifications.py rename to ceilometer/tests/unit/orchestration/test_notifications.py diff --git a/ceilometer/tests/volume/__init__.py b/ceilometer/tests/unit/profiler/__init__.py similarity index 100% rename from ceilometer/tests/volume/__init__.py rename to ceilometer/tests/unit/profiler/__init__.py diff --git a/ceilometer/tests/profiler/test_notifications.py b/ceilometer/tests/unit/profiler/test_notifications.py similarity index 100% rename from ceilometer/tests/profiler/test_notifications.py rename to ceilometer/tests/unit/profiler/test_notifications.py diff --git a/ceilometer/tests/unit/publisher/__init__.py b/ceilometer/tests/unit/publisher/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ceilometer/tests/publisher/test_file.py b/ceilometer/tests/unit/publisher/test_file.py similarity index 100% rename from ceilometer/tests/publisher/test_file.py rename to ceilometer/tests/unit/publisher/test_file.py diff --git a/ceilometer/tests/publisher/test_kafka_broker_publisher.py b/ceilometer/tests/unit/publisher/test_kafka_broker_publisher.py similarity index 100% rename from ceilometer/tests/publisher/test_kafka_broker_publisher.py rename to ceilometer/tests/unit/publisher/test_kafka_broker_publisher.py diff --git a/ceilometer/tests/publisher/test_messaging_publisher.py b/ceilometer/tests/unit/publisher/test_messaging_publisher.py similarity index 100% rename from ceilometer/tests/publisher/test_messaging_publisher.py rename to ceilometer/tests/unit/publisher/test_messaging_publisher.py diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/unit/publisher/test_udp.py similarity index 100% rename from ceilometer/tests/publisher/test_udp.py rename to ceilometer/tests/unit/publisher/test_udp.py diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/unit/publisher/test_utils.py similarity index 100% rename from ceilometer/tests/publisher/test_utils.py rename to ceilometer/tests/unit/publisher/test_utils.py diff --git a/ceilometer/tests/unit/storage/__init__.py b/ceilometer/tests/unit/storage/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ceilometer/tests/unit/storage/sqlalchemy/__init__.py b/ceilometer/tests/unit/storage/sqlalchemy/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ceilometer/tests/storage/sqlalchemy/test_models.py b/ceilometer/tests/unit/storage/sqlalchemy/test_models.py similarity index 100% rename from ceilometer/tests/storage/sqlalchemy/test_models.py rename to ceilometer/tests/unit/storage/sqlalchemy/test_models.py diff --git a/ceilometer/tests/storage/test_base.py b/ceilometer/tests/unit/storage/test_base.py similarity index 99% rename from ceilometer/tests/storage/test_base.py rename to ceilometer/tests/unit/storage/test_base.py index 686c97f974..f86393b511 100644 --- a/ceilometer/tests/storage/test_base.py +++ b/ceilometer/tests/unit/storage/test_base.py @@ -1,4 +1,3 @@ -# # Copyright 2013 eNovance # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/unit/storage/test_get_connection.py similarity index 100% rename from ceilometer/tests/storage/test_get_connection.py rename to ceilometer/tests/unit/storage/test_get_connection.py diff --git a/ceilometer/tests/storage/test_models.py b/ceilometer/tests/unit/storage/test_models.py similarity index 100% rename from ceilometer/tests/storage/test_models.py rename to ceilometer/tests/unit/storage/test_models.py diff --git a/ceilometer/tests/unit/telemetry/__init__.py b/ceilometer/tests/unit/telemetry/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ceilometer/tests/telemetry/test_notifications.py b/ceilometer/tests/unit/telemetry/test_notifications.py similarity index 100% rename from ceilometer/tests/telemetry/test_notifications.py rename to ceilometer/tests/unit/telemetry/test_notifications.py diff --git a/ceilometer/tests/test_coordination.py b/ceilometer/tests/unit/test_coordination.py similarity index 100% rename from ceilometer/tests/test_coordination.py rename to ceilometer/tests/unit/test_coordination.py diff --git a/ceilometer/tests/test_decoupled_pipeline.py b/ceilometer/tests/unit/test_decoupled_pipeline.py similarity index 100% rename from ceilometer/tests/test_decoupled_pipeline.py rename to ceilometer/tests/unit/test_decoupled_pipeline.py diff --git a/ceilometer/tests/test_event_pipeline.py b/ceilometer/tests/unit/test_event_pipeline.py similarity index 100% rename from ceilometer/tests/test_event_pipeline.py rename to ceilometer/tests/unit/test_event_pipeline.py diff --git a/ceilometer/tests/test_hacking.py b/ceilometer/tests/unit/test_hacking.py similarity index 100% rename from ceilometer/tests/test_hacking.py rename to ceilometer/tests/unit/test_hacking.py diff --git a/ceilometer/tests/test_messaging.py b/ceilometer/tests/unit/test_messaging.py similarity index 100% rename from ceilometer/tests/test_messaging.py rename to ceilometer/tests/unit/test_messaging.py diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/unit/test_middleware.py similarity index 100% rename from ceilometer/tests/test_middleware.py rename to ceilometer/tests/unit/test_middleware.py diff --git a/ceilometer/tests/test_neutronclient.py b/ceilometer/tests/unit/test_neutronclient.py similarity index 100% rename from ceilometer/tests/test_neutronclient.py rename to ceilometer/tests/unit/test_neutronclient.py diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/unit/test_novaclient.py similarity index 100% rename from ceilometer/tests/test_novaclient.py rename to ceilometer/tests/unit/test_novaclient.py diff --git a/ceilometer/tests/test_sample.py b/ceilometer/tests/unit/test_sample.py similarity index 100% rename from ceilometer/tests/test_sample.py rename to ceilometer/tests/unit/test_sample.py diff --git a/ceilometer/tests/test_utils.py b/ceilometer/tests/unit/test_utils.py similarity index 100% rename from ceilometer/tests/test_utils.py rename to ceilometer/tests/unit/test_utils.py diff --git a/ceilometer/tests/unit/volume/__init__.py b/ceilometer/tests/unit/volume/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ceilometer/tests/volume/test_notifications.py b/ceilometer/tests/unit/volume/test_notifications.py similarity index 100% rename from ceilometer/tests/volume/test_notifications.py rename to ceilometer/tests/unit/volume/test_notifications.py diff --git a/tox.ini b/tox.ini index 168112f1f8..376b115924 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,9 @@ install_command = pip install -U {opts} {packages} usedevelop = True setenv = VIRTUAL_ENV={envdir} EVENTLET_NO_GREENDNS=yes + OS_TEST_PATH=ceilometer/tests/unit commands = - bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr --slowest --testr-args="{posargs}" + python setup.py testr --slowest --testr-args="{posargs}" whitelist_externals = bash # TODO(ityaptin): With separation tests to unit and functional folders we need @@ -19,19 +20,23 @@ whitelist_externals = bash # in "py-" jobs [testenv:py-mongodb] +setenv = OS_TEST_PATH=ceilometer/tests/functional/ commands = bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr --slowest --testr-args="{posargs}" [testenv:py-mysql] +setenv = OS_TEST_PATH=ceilometer/tests/functional/ commands = bash -x {toxinidir}/setup-test-env-mysql.sh python setup.py testr --slowest --testr-args="{posargs}" [testenv:py-pgsql] +setenv = OS_TEST_PATH=ceilometer/tests/functional/ commands = bash -x {toxinidir}/setup-test-env-postgresql.sh python setup.py testr --slowest --testr-args="{posargs}" # Functional tests for elastic search [testenv:py-elastic] +setenv = OS_TEST_PATH=ceilometer/tests/functional/ commands = bash -x {toxinidir}/setup-test-env-es.sh python setup.py testr --slowest --testr-args="{posargs}" @@ -57,7 +62,7 @@ commands = # gabbi tests without needing to discovery across the entire body of # tests. [testenv:gabbi] -setenv = OS_TEST_PATH=ceilometer/tests/gabbi +setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi commands = bash -x {toxinidir}/setup-test-env-mongodb.sh \ python setup.py testr --testr-args="{posargs}"