Identify more py34 tests that already pass
Couple of tiny fixes and we essentially double our py34 coverage. Change-Id: I77355043d613b8b3b6789950302c54b16b690049
This commit is contained in:
Davanum Srinivas
parent
8eef1666e0
commit
b4e86c8ea1
|
|
@ -1342,7 +1342,7 @@ class StatsDictTestCase(BaseTrackerTestCase):
|
|||
stats = self.tracker.compute_node.stats
|
||||
# compute node stats are coerced to strings
|
||||
expected_stats = copy.deepcopy(FAKE_VIRT_STATS_COERCED)
|
||||
for k, v in self.tracker.stats.iteritems():
|
||||
for k, v in self.tracker.stats.items():
|
||||
expected_stats[k] = six.text_type(v)
|
||||
self.assertEqual(expected_stats, stats)
|
||||
|
||||
|
|
@ -1374,7 +1374,7 @@ class StatsJsonTestCase(BaseTrackerTestCase):
|
|||
stats = self.tracker.compute_node.stats
|
||||
# compute node stats are coerced to strings
|
||||
expected_stats = copy.deepcopy(FAKE_VIRT_STATS_COERCED)
|
||||
for k, v in self.tracker.stats.iteritems():
|
||||
for k, v in self.tracker.stats.items():
|
||||
expected_stats[k] = six.text_type(v)
|
||||
self.assertEqual(expected_stats, stats)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ Tests For weights.
|
|||
import mock
|
||||
|
||||
from nova.scheduler import weights as scheduler_weights
|
||||
from nova.scheduler.weights import ram
|
||||
from nova import test
|
||||
from nova.tests.unit.scheduler import fakes
|
||||
from nova import weights
|
||||
|
|
@ -65,7 +66,7 @@ class TestWeigher(test.NoDBTestCase):
|
|||
for host, node, values in host_values]
|
||||
|
||||
weight_handler = scheduler_weights.HostWeightHandler()
|
||||
weighers = [scheduler_weights.ram.RAMWeigher()]
|
||||
weighers = [ram.RAMWeigher()]
|
||||
weighed_host = weight_handler.get_weighed_objects(weighers,
|
||||
hostinfo, {})
|
||||
self.assertEqual(1, len(weighed_host))
|
||||
|
|
|
|||
236
tox.ini
236
tox.ini
|
|
@ -40,9 +40,148 @@ commands =
|
|||
find . -type f -name "*.pyc" -delete
|
||||
python -m subunit.run discover -t . ./nova/tests/ --list
|
||||
python -m testtools.run \
|
||||
nova.tests.unit.api.ec2.test_ec2utils \
|
||||
nova.tests.unit.api.ec2.test_faults \
|
||||
nova.tests.unit.api.openstack.compute.legacy_v2.test_auth \
|
||||
nova.tests.unit.api.openstack.compute.test_admin_actions \
|
||||
nova.tests.unit.api.openstack.compute.test_admin_password \
|
||||
nova.tests.unit.api.openstack.compute.test_agents \
|
||||
nova.tests.unit.api.openstack.compute.test_aggregates \
|
||||
nova.tests.unit.api.openstack.compute.test_attach_interfaces \
|
||||
nova.tests.unit.api.openstack.compute.test_auth \
|
||||
nova.tests.unit.api.openstack.compute.test_baremetal_nodes \
|
||||
nova.tests.unit.api.openstack.compute.test_cells \
|
||||
nova.tests.unit.api.openstack.compute.test_certificates \
|
||||
nova.tests.unit.api.openstack.compute.test_cloudpipe \
|
||||
nova.tests.unit.api.openstack.compute.test_cloudpipe_update \
|
||||
nova.tests.unit.api.openstack.compute.test_console_auth_tokens \
|
||||
nova.tests.unit.api.openstack.compute.test_consoles \
|
||||
nova.tests.unit.api.openstack.compute.test_create_backup \
|
||||
nova.tests.unit.api.openstack.compute.test_deferred_delete \
|
||||
nova.tests.unit.api.openstack.compute.test_evacuate \
|
||||
nova.tests.unit.api.openstack.compute.test_extended_hypervisors \
|
||||
nova.tests.unit.api.openstack.compute.test_extended_rescue_with_image \
|
||||
nova.tests.unit.api.openstack.compute.test_extension_info \
|
||||
nova.tests.unit.api.openstack.compute.test_extensions \
|
||||
nova.tests.unit.api.openstack.compute.test_fixed_ips \
|
||||
nova.tests.unit.api.openstack.compute.test_flavor_access \
|
||||
nova.tests.unit.api.openstack.compute.test_flavors \
|
||||
nova.tests.unit.api.openstack.compute.test_floating_ip_pools \
|
||||
nova.tests.unit.api.openstack.compute.test_floating_ips_bulk \
|
||||
nova.tests.unit.api.openstack.compute.test_fping \
|
||||
nova.tests.unit.api.openstack.compute.test_hypervisor_status \
|
||||
nova.tests.unit.api.openstack.compute.test_hypervisors \
|
||||
nova.tests.unit.api.openstack.compute.test_images \
|
||||
nova.tests.unit.api.openstack.compute.test_instance_actions \
|
||||
nova.tests.unit.api.openstack.compute.test_instance_usage_audit_log \
|
||||
nova.tests.unit.api.openstack.compute.test_lock_server \
|
||||
nova.tests.unit.api.openstack.compute.test_migrate_server \
|
||||
nova.tests.unit.api.openstack.compute.test_migrations \
|
||||
nova.tests.unit.api.openstack.compute.test_multinic \
|
||||
nova.tests.unit.api.openstack.compute.test_pause_server \
|
||||
nova.tests.unit.api.openstack.compute.test_pci \
|
||||
nova.tests.unit.api.openstack.compute.test_quota_classes \
|
||||
nova.tests.unit.api.openstack.compute.test_quotas \
|
||||
nova.tests.unit.api.openstack.compute.test_remote_consoles \
|
||||
nova.tests.unit.api.openstack.compute.test_rescue \
|
||||
nova.tests.unit.api.openstack.compute.test_server_external_events \
|
||||
nova.tests.unit.api.openstack.compute.test_server_group_quotas \
|
||||
nova.tests.unit.api.openstack.compute.test_server_groups \
|
||||
nova.tests.unit.api.openstack.compute.test_server_password \
|
||||
nova.tests.unit.api.openstack.compute.test_server_reset_state \
|
||||
nova.tests.unit.api.openstack.compute.test_server_start_stop \
|
||||
nova.tests.unit.api.openstack.compute.test_services \
|
||||
nova.tests.unit.api.openstack.compute.test_shelve \
|
||||
nova.tests.unit.api.openstack.compute.test_snapshots \
|
||||
nova.tests.unit.api.openstack.compute.test_suspend_server \
|
||||
nova.tests.unit.api.openstack.compute.test_tenant_networks \
|
||||
nova.tests.unit.api.openstack.compute.test_used_limits \
|
||||
nova.tests.unit.api.openstack.compute.test_virtual_interfaces \
|
||||
nova.tests.unit.api.openstack.test_api_version_request \
|
||||
nova.tests.unit.api.test_auth \
|
||||
nova.tests.unit.cells.test_cells_filters \
|
||||
nova.tests.unit.cells.test_cells_manager \
|
||||
nova.tests.unit.cells.test_cells_rpc_driver \
|
||||
nova.tests.unit.cells.test_cells_rpcapi \
|
||||
nova.tests.unit.cells.test_cells_utils \
|
||||
nova.tests.unit.cells.test_cells_weights \
|
||||
nova.tests.unit.cmd.test_idmapshift \
|
||||
nova.tests.unit.cmd.test_manage \
|
||||
nova.tests.unit.compute.monitors.cpu.test_virt_driver \
|
||||
nova.tests.unit.compute.monitors.test_monitors \
|
||||
nova.tests.unit.compute.test_arch \
|
||||
nova.tests.unit.compute.test_claims \
|
||||
nova.tests.unit.compute.test_flavors \
|
||||
nova.tests.unit.compute.test_hvtype \
|
||||
nova.tests.unit.compute.test_keypairs \
|
||||
nova.tests.unit.compute.test_multiple_nodes \
|
||||
nova.tests.unit.compute.test_resource_tracker \
|
||||
nova.tests.unit.compute.test_stats \
|
||||
nova.tests.unit.compute.test_virtapi \
|
||||
nova.tests.unit.compute.test_vmmode \
|
||||
nova.tests.unit.conductor.tasks.test_base \
|
||||
nova.tests.unit.conductor.tasks.test_live_migrate \
|
||||
nova.tests.unit.conductor.tasks.test_migrate \
|
||||
nova.tests.unit.console.test_console \
|
||||
nova.tests.unit.console.test_serial \
|
||||
nova.tests.unit.console.test_type \
|
||||
nova.tests.unit.db.test_db_api \
|
||||
nova.tests.unit.db.test_migration_utils \
|
||||
nova.tests.unit.db.test_sqlalchemy_migration \
|
||||
nova.tests.unit.db.test_sqlite \
|
||||
nova.tests.unit.image.test_transfer_modules \
|
||||
nova.tests.unit.keymgr.test_not_implemented_key_mgr \
|
||||
nova.tests.unit.network.security_group.test_neutron_driver \
|
||||
nova.tests.unit.network.test_network_info \
|
||||
nova.tests.unit.objects.test_agent \
|
||||
nova.tests.unit.objects.test_aggregate \
|
||||
nova.tests.unit.objects.test_bandwidth_usage \
|
||||
nova.tests.unit.objects.test_block_device \
|
||||
nova.tests.unit.objects.test_cell_mapping \
|
||||
nova.tests.unit.objects.test_compute_node \
|
||||
nova.tests.unit.objects.test_dns_domain \
|
||||
nova.tests.unit.objects.test_ec2 \
|
||||
nova.tests.unit.objects.test_external_event \
|
||||
nova.tests.unit.objects.test_fields \
|
||||
nova.tests.unit.objects.test_fixed_ip \
|
||||
nova.tests.unit.objects.test_flavor \
|
||||
nova.tests.unit.objects.test_floating_ip \
|
||||
nova.tests.unit.objects.test_host_mapping \
|
||||
nova.tests.unit.objects.test_hv_spec \
|
||||
nova.tests.unit.objects.test_image_meta \
|
||||
nova.tests.unit.objects.test_instance \
|
||||
nova.tests.unit.objects.test_instance_action \
|
||||
nova.tests.unit.objects.test_instance_fault \
|
||||
nova.tests.unit.objects.test_instance_group \
|
||||
nova.tests.unit.objects.test_instance_info_cache \
|
||||
nova.tests.unit.objects.test_instance_mapping \
|
||||
nova.tests.unit.objects.test_instance_numa_topology \
|
||||
nova.tests.unit.objects.test_instance_pci_requests \
|
||||
nova.tests.unit.objects.test_keypair \
|
||||
nova.tests.unit.objects.test_migration \
|
||||
nova.tests.unit.objects.test_migration_context \
|
||||
nova.tests.unit.objects.test_monitor_metric \
|
||||
nova.tests.unit.objects.test_network \
|
||||
nova.tests.unit.objects.test_network_request \
|
||||
nova.tests.unit.objects.test_numa \
|
||||
nova.tests.unit.objects.test_objects \
|
||||
nova.tests.unit.objects.test_pci_device \
|
||||
nova.tests.unit.objects.test_pci_device_pool \
|
||||
nova.tests.unit.objects.test_quotas \
|
||||
nova.tests.unit.objects.test_request_spec \
|
||||
nova.tests.unit.objects.test_security_group \
|
||||
nova.tests.unit.objects.test_security_group_rule \
|
||||
nova.tests.unit.objects.test_service \
|
||||
nova.tests.unit.objects.test_tag \
|
||||
nova.tests.unit.objects.test_task_log \
|
||||
nova.tests.unit.objects.test_vcpu_model \
|
||||
nova.tests.unit.objects.test_virt_cpu_topology \
|
||||
nova.tests.unit.objects.test_virtual_interface \
|
||||
nova.tests.unit.objects.test_volume_usage \
|
||||
nova.tests.unit.pci.test_devspec \
|
||||
nova.tests.unit.pci.test_request \
|
||||
nova.tests.unit.pci.test_utils \
|
||||
nova.tests.unit.pci.test_whitelist \
|
||||
nova.tests.unit.scheduler.filters.test_affinity_filters \
|
||||
nova.tests.unit.scheduler.filters.test_aggregate_image_properties_isolation_filters \
|
||||
nova.tests.unit.scheduler.filters.test_aggregate_instance_extra_specs_filters \
|
||||
|
|
@ -85,48 +224,67 @@ commands =
|
|||
nova.tests.unit.scheduler.weights.test_weights_ioopsweight \
|
||||
nova.tests.unit.scheduler.weights.test_weights_metrics \
|
||||
nova.tests.unit.scheduler.weights.test_weights_ram \
|
||||
nova.tests.unit.objects.test_agent \
|
||||
nova.tests.unit.objects.test_aggregate \
|
||||
nova.tests.unit.objects.test_bandwidth_usage \
|
||||
nova.tests.unit.objects.test_block_device \
|
||||
nova.tests.unit.objects.test_cell_mapping \
|
||||
nova.tests.unit.objects.test_compute_node \
|
||||
nova.tests.unit.objects.test_dns_domain \
|
||||
nova.tests.unit.objects.test_ec2 \
|
||||
nova.tests.unit.objects.test_external_event \
|
||||
nova.tests.unit.objects.test_fields \
|
||||
nova.tests.unit.objects.test_fixed_ip \
|
||||
nova.tests.unit.objects.test_flavor \
|
||||
nova.tests.unit.objects.test_floating_ip \
|
||||
nova.tests.unit.objects.test_hv_spec \
|
||||
nova.tests.unit.objects.test_instance \
|
||||
nova.tests.unit.objects.test_instance_action \
|
||||
nova.tests.unit.objects.test_instance_fault \
|
||||
nova.tests.unit.objects.test_instance_group \
|
||||
nova.tests.unit.objects.test_instance_info_cache \
|
||||
nova.tests.unit.objects.test_instance_mapping \
|
||||
nova.tests.unit.objects.test_instance_numa_topology \
|
||||
nova.tests.unit.objects.test_instance_pci_requests \
|
||||
nova.tests.unit.objects.test_keypair \
|
||||
nova.tests.unit.objects.test_migration \
|
||||
nova.tests.unit.objects.test_network \
|
||||
nova.tests.unit.objects.test_network_request \
|
||||
nova.tests.unit.objects.test_numa \
|
||||
nova.tests.unit.objects.test_objects \
|
||||
nova.tests.unit.objects.test_pci_device \
|
||||
nova.tests.unit.objects.test_pci_device_pool \
|
||||
nova.tests.unit.objects.test_quotas \
|
||||
nova.tests.unit.objects.test_security_group \
|
||||
nova.tests.unit.objects.test_security_group_rule \
|
||||
nova.tests.unit.objects.test_service \
|
||||
nova.tests.unit.objects.test_tag \
|
||||
nova.tests.unit.objects.test_vcpu_model \
|
||||
nova.tests.unit.objects.test_virt_cpu_topology \
|
||||
nova.tests.unit.objects.test_virtual_interface \
|
||||
nova.tests.unit.servicegroup.test_api \
|
||||
nova.tests.unit.servicegroup.test_db_servicegroup \
|
||||
nova.tests.unit.servicegroup.test_mc_servicegroup \
|
||||
nova.tests.unit.test_availability_zones \
|
||||
nova.tests.unit.test_baserpc \
|
||||
nova.tests.unit.test_context \
|
||||
nova.tests.unit.test_crypto \
|
||||
nova.tests.unit.test_exception \
|
||||
nova.tests.unit.test_hooks \
|
||||
nova.tests.unit.test_instance_types_extra_specs \
|
||||
nova.tests.unit.test_loadables \
|
||||
nova.tests.unit.test_notifications \
|
||||
nova.tests.unit.test_safeutils \
|
||||
nova.tests.unit.test_service \
|
||||
nova.tests.unit.test_test \
|
||||
nova.tests.unit.test_utils \
|
||||
nova.tests.unit.test_versions
|
||||
nova.tests.unit.test_versions \
|
||||
nova.tests.unit.test_weights \
|
||||
nova.tests.unit.virt.disk.mount.test_loop \
|
||||
nova.tests.unit.virt.disk.test_api \
|
||||
nova.tests.unit.virt.disk.test_inject \
|
||||
nova.tests.unit.virt.disk.vfs.test_guestfs \
|
||||
nova.tests.unit.virt.disk.vfs.test_localfs \
|
||||
nova.tests.unit.virt.hyperv.test_basevolumeutils \
|
||||
nova.tests.unit.virt.hyperv.test_imagecache \
|
||||
nova.tests.unit.virt.hyperv.test_rdpconsoleutils \
|
||||
nova.tests.unit.virt.image.test_model \
|
||||
nova.tests.unit.virt.ironic.test_client_wrapper \
|
||||
nova.tests.unit.virt.libvirt.storage.test_dmcrypt \
|
||||
nova.tests.unit.virt.libvirt.test_blockinfo \
|
||||
nova.tests.unit.virt.libvirt.test_compat \
|
||||
nova.tests.unit.virt.libvirt.test_designer \
|
||||
nova.tests.unit.virt.libvirt.test_guest \
|
||||
nova.tests.unit.virt.libvirt.volume.test_aoe \
|
||||
nova.tests.unit.virt.libvirt.volume.test_fibrechannel \
|
||||
nova.tests.unit.virt.libvirt.volume.test_fs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_glusterfs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_gpfs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_hgst \
|
||||
nova.tests.unit.virt.libvirt.volume.test_iscsi \
|
||||
nova.tests.unit.virt.libvirt.volume.test_iser \
|
||||
nova.tests.unit.virt.libvirt.volume.test_net \
|
||||
nova.tests.unit.virt.libvirt.volume.test_nfs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_quobyte \
|
||||
nova.tests.unit.virt.libvirt.volume.test_remotefs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_scaleio \
|
||||
nova.tests.unit.virt.libvirt.volume.test_scality \
|
||||
nova.tests.unit.virt.libvirt.volume.test_smbfs \
|
||||
nova.tests.unit.virt.libvirt.volume.test_volume \
|
||||
nova.tests.unit.virt.test_configdrive \
|
||||
nova.tests.unit.virt.test_diagnostics \
|
||||
nova.tests.unit.virt.test_driver \
|
||||
nova.tests.unit.virt.test_events \
|
||||
nova.tests.unit.virt.test_fake \
|
||||
nova.tests.unit.virt.test_imagecache \
|
||||
nova.tests.unit.virt.test_images \
|
||||
nova.tests.unit.virt.test_volumeutils \
|
||||
nova.tests.unit.virt.vmwareapi.test_ds_util_datastore_selection \
|
||||
nova.tests.unit.virt.vmwareapi.test_io_util \
|
||||
nova.tests.unit.volume.encryptors.test_base \
|
||||
nova.tests.unit.volume.encryptors.test_nop
|
||||
|
||||
[testenv:functional]
|
||||
usedevelop = True
|
||||
|
|
|
|||
Loading…
Reference in New Issue