mongo: fix last python3 bugs

Change-Id: Ie27c51fee6ee3dc42bfb50fede99a97acbf0181c
This commit is contained in:
Mehdi Abaakouk 2015-07-31 14:39:38 +02:00
parent 8f933f149a
commit 3a136f954d
2 changed files with 4 additions and 70 deletions

View File

@ -139,8 +139,10 @@ class CompatibilityTest(test_storage_scenarios.DBTestBase,
{'field': 'key2',
'op': 'eq',
'value': 'value2',
'type': 'string'}]),
sorted(old.rule['query']),)
'type': 'string'}],
key=lambda obj: sorted(obj.items())),
sorted(old.rule['query'],
key=lambda obj: sorted(obj.items())))
self.assertEqual('cpu', old.rule['meter_name'])
self.assertEqual(60, old.rule['period'])
self.assertEqual(1, old.rule['evaluation_periods'])

68
tox.ini
View File

@ -52,74 +52,6 @@ passenv = HEAT_* CEILOMETER_* GNOCCHI_* AODH_* GLANCE_* NOVA_* ADMIN_*
commands =
bash -x {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:py34]
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python -m testtools.run \
ceilometer.tests.api.v2.test_alarm_scenarios.TestAlarms.test_alarms_query_with_timestamp \
ceilometer.tests.api.v2.test_alarm_scenarios.TestAlarms.test_get_alarm_history_constrained_by_alarm_id_failed \
ceilometer.tests.api.v2.test_alarm_scenarios.TestAlarms.test_post_invalid_alarm_input_enabled_int \
ceilometer.tests.api.v2.test_api_upgrade.TestAPIUpgradePath.test_gnocchi_enabled_without_database_backend_configoptions \
ceilometer.tests.api.v2.test_api_upgrade.TestAPIUpgradePath.test_gnocchi_enabled_without_database_backend_keystone \
ceilometer.tests.api.v2.test_app \
ceilometer.tests.api.v2.test_complex_query_scenarios.TestQueryMetersController.test_query_with_isotime \
ceilometer.tests.api.v2.test_complex_query_scenarios.TestQueryMetersController.test_query_with_volume_field_name_orderby \
ceilometer.tests.api.v2.test_complex_query_scenarios.TestQueryMetersController.test_query_with_wrong_json \
ceilometer.tests.api.v2.test_event_scenarios.TestEventAPI.test_get_events_filter_datetime_trait \
ceilometer.tests.api.v2.test_list_events_scenarios.TestListEvents.test_metadata \
ceilometer.tests.api.v2.test_list_meters_scenarios.TestListMeters.test_query_samples_with_invalid_field_name_and_eq_operator \
ceilometer.tests.api.v2.test_list_resources_scenarios.TestListResources.test_metadata \
ceilometer.tests.api.v2.test_list_resources_scenarios.TestListResources.test_with_invalid_resource_id \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_missing_project_user_id \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_multiple_project_id_and_admin \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_multiple_samples \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_multiple_samples_multiple_sources \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_nested_metadata \
ceilometer.tests.api.v2.test_post_samples_scenarios.TestPostSamples.test_one \
ceilometer.tests.storage.test_pymongo_base.CompatibilityTest.test_alarm_get_old_format_matching_metadata_array \
ceilometer.tests.api.v2.test_query \
ceilometer.tests.compute.virt.libvirt.test_inspector \
ceilometer.tests.compute.virt.vmware.test_vsphere_operations \
ceilometer.tests.data_processing.test_notifications \
ceilometer.tests.dispatcher.test_db \
ceilometer.tests.dispatcher.test_file \
ceilometer.tests.dispatcher.test_http \
ceilometer.tests.energy.test_kwapi \
ceilometer.tests.ipmi.platform.test_intel_node_manager \
ceilometer.tests.meter.test_notifications.TestMeterDefinition.test_bad_type_cfg_definition \
ceilometer.tests.meter.test_notifications.TestMeterDefinition.test_config_missing_fields \
ceilometer.tests.network.services.test_fwaas \
ceilometer.tests.network.services.test_lbaas \
ceilometer.tests.network.services.test_vpnaas \
ceilometer.tests.network.test_floatingip \
ceilometer.tests.network.test_notifications \
ceilometer.tests.objectstore.test_rgw \
ceilometer.tests.orchestration.test_notifications \
ceilometer.tests.profiler.test_notifications \
ceilometer.tests.publisher.test_direct \
ceilometer.tests.publisher.test_file \
ceilometer.tests.publisher.test_kafka_broker_publisher \
ceilometer.tests.publisher.test_messaging_publisher \
ceilometer.tests.publisher.test_utils \
ceilometer.tests.publisher.test_udp \
ceilometer.tests.storage.test_get_connection \
ceilometer.tests.storage.test_impl_sqlalchemy \
ceilometer.tests.storage.test_pymongo_base.CompatibilityTest.test_alarm_get_old_format_matching_metadata_array \
ceilometer.tests.test_bin \
ceilometer.tests.test_collector \
ceilometer.tests.test_coordination \
ceilometer.tests.test_event_pipeline \
ceilometer.tests.test_hacking \
ceilometer.tests.test_messaging \
ceilometer.tests.test_middleware \
ceilometer.tests.test_neutronclient \
ceilometer.tests.test_notification \
ceilometer.tests.test_novaclient \
ceilometer.tests.test_sample \
ceilometer.tests.test_utils \
ceilometer.tests.volume.test_notifications
# NOTE(chdent): The gabbi tests are also run under the primary tox
# targets. This target simply provides a target to directly run just
# gabbi tests without needing to discovery across the entire body of