openstack/nova
Code Issues Proposed changes

Fixes to get all functional tests working on py35

Browse Source 
tests-functional-py3.txt:
* Remove all tests except snowman from blacklist
* snowman seems to be a gabbi problem under py35

nova/objects/resource_provider.py:
* Cannot compare None and integer under py35
* wrap keys() in a list before comparing to a list as
  keys() is an iterator

nova/virt/fake.py:
* list_instance_uuids should return a list, keys() returns
    an iterator.

nova/tests/functional/api_sample_tests/*.py:
* use response.text to compare with a string as response.context
  contains bytes under python3
* user_data should be strings not bytes, so convert them
  as necessary

nova/tests/functional/regressions/test_bug_1554631.py:
* cinder exceptions need the http code as the first parameter
  (not a string)
* use response.text to compare with a string as response.context
  contains bytes under python3

nova/tests/functional/test_servers.py:
* zlib.compress needs bytes

Change-Id: I73be94afbb02dac46467555a8469f222a69025da
This commit is contained in:
Davanum Srinivas
2017-01-13 13:12:21 -05:00
parent db203ffe62
commit c78a86c558
26 changed files with 59 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
tests-functional-py3.txt
View File

@@ -1,198 +1,4 @@
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_confirm_inventory_change.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_get_list_of_inventories.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_get_now_empty_inventories.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_list_both_those_inventories.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_modify_inventory_invalid_data.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_modify_inventory_no_such_resource_class_in_inventory.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_modify_the_inventory.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_put_all_inventory_bad_capacity.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.inventory_put_all_inventory_unknown_resource_class.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.resource-provider_check_the_name_from_that_update.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.resource-provider_try_to_rename_that_provider_to_existing_name.test_request
nova.tests.functional.api.openstack.placement.test_placement_api.resource-provider_update_a_resource_provider.test_request
##############################################################################
# NOTE(dims): The following test looks like a gabbi failure under python 3.5
##############################################################################
nova.tests.functional.api.openstack.placement.test_placement_api.unicode_get_a_raw_snowman_unicode.test_request
nova.tests.functional.api_sample_tests.test_admin_actions.AdminActionsSamplesJsonTest.test_post_inject_network_info
nova.tests.functional.api_sample_tests.test_admin_actions.AdminActionsSamplesJsonTest.test_post_reset_network
nova.tests.functional.api_sample_tests.test_admin_actions.AdminActionsSamplesJsonTest.test_post_reset_state
nova.tests.functional.api_sample_tests.test_admin_password.AdminPasswordJsonTest.test_server_password
nova.tests.functional.api_sample_tests.test_assisted_volume_snapshots.AssistedVolumeSnapshotsJsonTests.test_snapshots_delete_assisted
nova.tests.functional.api_sample_tests.test_attach_interfaces.AttachInterfacesSampleJsonTest.test_create_interfaces
nova.tests.functional.api_sample_tests.test_attach_interfaces.AttachInterfacesSampleJsonTest.test_create_interfaces_with_net_id_and_fixed_ips
nova.tests.functional.api_sample_tests.test_attach_interfaces.AttachInterfacesSampleJsonTest.test_delete_interfaces
nova.tests.functional.api_sample_tests.test_attach_interfaces.AttachInterfacesSampleJsonTest.test_list_interfaces
nova.tests.functional.api_sample_tests.test_attach_interfaces.AttachInterfacesSampleJsonTest.test_show_interfaces
nova.tests.functional.api_sample_tests.test_block_device_mapping_boot.BlockDeviceMappingV1BootJsonTest.test_servers_post_with_bdm
nova.tests.functional.api_sample_tests.test_block_device_mapping_boot.BlockDeviceMappingV2BootJsonTest.test_servers_post_with_bdm
nova.tests.functional.api_sample_tests.test_cloudpipe.CloudPipeSampleTest.test_cloud_pipe_update
nova.tests.functional.api_sample_tests.test_console_auth_tokens.ConsoleAuthTokensSampleJsonTests.test_get_console_connect_info
nova.tests.functional.api_sample_tests.test_console_output.ConsoleOutputSampleJsonTest.test_get_console_output
nova.tests.functional.api_sample_tests.test_consoles.ConsolesSamplesJsonTest.test_console_delete
nova.tests.functional.api_sample_tests.test_consoles.ConsolesSamplesJsonTest.test_console_get
nova.tests.functional.api_sample_tests.test_consoles.ConsolesSamplesJsonTest.test_create_consoles
nova.tests.functional.api_sample_tests.test_consoles.ConsolesSamplesJsonTest.test_list_consoles
nova.tests.functional.api_sample_tests.test_create_backup.CreateBackupSamplesJsonTest.test_post_backup_server
nova.tests.functional.api_sample_tests.test_deferred_delete.DeferredDeleteSampleJsonTests.test_force_delete
nova.tests.functional.api_sample_tests.test_deferred_delete.DeferredDeleteSampleJsonTests.test_restore
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTest.test_server_evacuate
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTest.test_server_evacuate_find_host
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTestV214.test_server_evacuate
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTestV214.test_server_evacuate_find_host
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTestV229.test_server_evacuate
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTestV229.test_server_evacuate_find_host
nova.tests.functional.api_sample_tests.test_evacuate.EvacuateJsonTestV229.test_server_evacuate_with_force
nova.tests.functional.api_sample_tests.test_fixed_ips.FixedIpTest.test_fixed_ip_reserve
nova.tests.functional.api_sample_tests.test_fixed_ips.FixedIpV24Test.test_fixed_ip_reserve
nova.tests.functional.api_sample_tests.test_flavor_extraspecs.FlavorExtraSpecsSampleJsonTests.test_flavor_extra_specs_delete
nova.tests.functional.api_sample_tests.test_flavor_manage.FlavorManageSampleJsonTests.test_create_delete_flavor
nova.tests.functional.api_sample_tests.test_floating_ips.FloatingIpsTest.test_floating_ips_delete
nova.tests.functional.api_sample_tests.test_fping.FpingSampleJsonTests.test_get_fping
nova.tests.functional.api_sample_tests.test_fping.FpingSampleJsonTests.test_get_fping_details
nova.tests.functional.api_sample_tests.test_hide_server_addresses.ServersSampleHideAddressesJsonTest.test_servers_details
nova.tests.functional.api_sample_tests.test_hide_server_addresses.ServersSampleHideAddressesJsonTest.test_servers_get
nova.tests.functional.api_sample_tests.test_hide_server_addresses.ServersSampleHideAddressesJsonTest.test_servers_list
nova.tests.functional.api_sample_tests.test_hide_server_addresses.ServersSampleHideAddressesJsonTest.test_servers_post
nova.tests.functional.api_sample_tests.test_lock_server.LockServerSamplesJsonTest.test_post_lock_server
nova.tests.functional.api_sample_tests.test_lock_server.LockServerSamplesJsonTest.test_post_unlock_server
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTest.test_live_migrate_compute_host_not_found
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTest.test_post_live_migrate_server
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTest.test_post_migrate
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV225.test_live_migrate_compute_host_not_found
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV225.test_post_live_migrate_server
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV225.test_post_migrate
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV230.test_live_migrate_compute_host_not_found
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV230.test_post_live_migrate_server
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV230.test_post_live_migrate_server_with_force
nova.tests.functional.api_sample_tests.test_migrate_server.MigrateServerSamplesJsonTestV230.test_post_migrate
nova.tests.functional.api_sample_tests.test_multinic.MultinicSampleJsonTest.test_add_fixed_ip
nova.tests.functional.api_sample_tests.test_multinic.MultinicSampleJsonTest.test_remove_fixed_ip
nova.tests.functional.api_sample_tests.test_networks.NetworksJsonTests.test_network_add
nova.tests.functional.api_sample_tests.test_networks.NetworksJsonTests.test_network_delete
nova.tests.functional.api_sample_tests.test_networks_associate.NetworksAssociateJsonTests.test_associate_host
nova.tests.functional.api_sample_tests.test_networks_associate.NetworksAssociateJsonTests.test_disassociate
nova.tests.functional.api_sample_tests.test_networks_associate.NetworksAssociateJsonTests.test_disassociate_host
nova.tests.functional.api_sample_tests.test_networks_associate.NetworksAssociateJsonTests.test_disassociate_project
nova.tests.functional.api_sample_tests.test_pause_server.PauseServerSamplesJsonTest.test_post_pause
nova.tests.functional.api_sample_tests.test_pause_server.PauseServerSamplesJsonTest.test_post_unpause
nova.tests.functional.api_sample_tests.test_preserve_ephemeral_rebuild.PreserveEphemeralOnRebuildJsonTest.test_server_rebuild_preserve_ephemeral_false
nova.tests.functional.api_sample_tests.test_preserve_ephemeral_rebuild.PreserveEphemeralOnRebuildJsonTest.test_server_rebuild_preserve_ephemeral_true
nova.tests.functional.api_sample_tests.test_quota_sets.QuotaSetsSampleJsonTests.test_delete_quotas
nova.tests.functional.api_sample_tests.test_quota_sets.QuotaSetsSampleJsonTests.test_delete_quotas_for_user
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesSampleJsonTests.test_get_rdp_console
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesSampleJsonTests.test_get_serial_console
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesSampleJsonTests.test_get_spice_console
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesSampleJsonTests.test_get_vnc_console
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesV26SampleJsonTests.test_create_console
nova.tests.functional.api_sample_tests.test_remote_consoles.ConsolesV28SampleJsonTests.test_create_mks_console
nova.tests.functional.api_sample_tests.test_rescue.RescueJsonTest.test_server_rescue
nova.tests.functional.api_sample_tests.test_rescue.RescueJsonTest.test_server_rescue_with_image_ref_specified
nova.tests.functional.api_sample_tests.test_rescue.RescueJsonTest.test_server_unrescue
nova.tests.functional.api_sample_tests.test_security_groups.SecurityGroupsJsonTest.test_security_groups_add
nova.tests.functional.api_sample_tests.test_security_groups.SecurityGroupsJsonTest.test_security_groups_list_server
nova.tests.functional.api_sample_tests.test_security_groups.SecurityGroupsJsonTest.test_security_groups_remove
nova.tests.functional.api_sample_tests.test_server_diagnostics.ServerDiagnosticsSamplesJsonTest.test_server_diagnostics_get
nova.tests.functional.api_sample_tests.test_server_external_events.ServerExternalEventsSamplesJsonTest.test_create_event
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_delete
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_get
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_get_all
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_post_all
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_put
nova.tests.functional.api_sample_tests.test_server_metadata.ServersMetadataJsonTest.test_metadata_put_all
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTest.test_get_migration
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTest.test_list_migrations
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTest.test_live_migrate_force_complete
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTestV2_24.test_live_migrate_abort
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTestV2_24.test_live_migrate_abort_migration_not_found
nova.tests.functional.api_sample_tests.test_server_migrations.ServerMigrationsSampleJsonTestV2_24.test_live_migrate_abort_migration_not_running
nova.tests.functional.api_sample_tests.test_server_password.ServerPasswordSampleJsonTests.test_get_password
nova.tests.functional.api_sample_tests.test_server_password.ServerPasswordSampleJsonTests.test_reset_password
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_delete
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_delete_all
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_index
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_list_with_details_information
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_show
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_show_with_details_information
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_update
nova.tests.functional.api_sample_tests.test_server_tags.ServerTagsJsonTest.test_server_tags_update_all
nova.tests.functional.api_sample_tests.test_servers.ServerSortKeysJsonTests.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServerStartStopJsonTest.test_server_start
nova.tests.functional.api_sample_tests.test_servers.ServerStartStopJsonTest.test_server_stop
nova.tests.functional.api_sample_tests.test_servers.ServerTriggerCrashDumpJsonTest.test_trigger_crash_dump
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJson219Test.test_server_rebuild
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_add_floating_ip
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_confirm_resize
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_create_image
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_reboot_hard
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_reboot_soft
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_rebuild
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_resize
nova.tests.functional.api_sample_tests.test_servers.ServersActionsJsonTest.test_server_revert_resize
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson216Test.test_servers_details
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson216Test.test_servers_get
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson216Test.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson216Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson219Test.test_servers_details
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson219Test.test_servers_get
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson219Test.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson219Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson219Test.test_servers_put
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson232Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson237Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson23Test.test_servers_details
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson23Test.test_servers_get
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson23Test.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson23Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson29Test.test_servers_details
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson29Test.test_servers_get
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson29Test.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJson29Test.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJsonTest.test_servers_details
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJsonTest.test_servers_get
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJsonTest.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersSampleJsonTest.test_servers_post
nova.tests.functional.api_sample_tests.test_servers.ServersSampleMultiStatusJsonTest.test_servers_list
nova.tests.functional.api_sample_tests.test_servers.ServersUpdateSampleJsonTest.test_update_server
nova.tests.functional.api_sample_tests.test_servers_ips.ServersIpsJsonTest.test_get
nova.tests.functional.api_sample_tests.test_servers_ips.ServersIpsJsonTest.test_get_by_network
nova.tests.functional.api_sample_tests.test_services.ServicesJsonTest.test_service_delete
nova.tests.functional.api_sample_tests.test_services.ServicesV211JsonTest.test_service_delete
nova.tests.functional.api_sample_tests.test_shelve.ShelveJsonTest.test_shelve
nova.tests.functional.api_sample_tests.test_shelve.ShelveJsonTest.test_shelve_offload
nova.tests.functional.api_sample_tests.test_shelve.ShelveJsonTest.test_unshelve
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageSampleJsonTest.test_get_tenant_usage_details
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageSampleJsonTest.test_get_tenants_usage
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageSampleJsonTest.test_get_tenants_usage_with_detail
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageV240Test.test_get_tenant_usage_details
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageV240Test.test_get_tenants_usage
nova.tests.functional.api_sample_tests.test_simple_tenant_usage.SimpleTenantUsageV240Test.test_get_tenants_usage_with_detail
nova.tests.functional.api_sample_tests.test_suspend_server.SuspendServerSamplesJsonTest.test_post_resume
nova.tests.functional.api_sample_tests.test_suspend_server.SuspendServerSamplesJsonTest.test_post_suspend
nova.tests.functional.api_sample_tests.test_tenant_networks.TenantNetworksJsonTests.test_delete_network
nova.tests.functional.api_sample_tests.test_virtual_interfaces.VirtualInterfacesJsonTest.test_vifs_list
nova.tests.functional.api_sample_tests.test_virtual_interfaces.VirtualInterfacesJsonV212Test.test_vifs_list
nova.tests.functional.api_sample_tests.test_volumes.SnapshotsSampleJsonTests.test_snapshots_delete
nova.tests.functional.api_sample_tests.test_volumes.VolumeAttachmentsSample.test_attach_volume_to_server
nova.tests.functional.api_sample_tests.test_volumes.VolumeAttachmentsSample.test_list_volume_attachments
nova.tests.functional.api_sample_tests.test_volumes.VolumeAttachmentsSample.test_volume_attachment_delete
nova.tests.functional.api_sample_tests.test_volumes.VolumeAttachmentsSample.test_volume_attachment_detail
nova.tests.functional.api_sample_tests.test_volumes.VolumeAttachmentsSample.test_volume_attachment_update
nova.tests.functional.api_sample_tests.test_volumes.VolumesSampleJsonTest.test_volumes_delete
nova.tests.functional.db.test_instance_group.InstanceGroupObjectTestCase.test_add_members_main
nova.tests.functional.db.test_resource_provider.ResourceProviderTestCase.test_provider_modify_inventory
nova.tests.functional.db.test_resource_provider.ResourceProviderTestCase.test_save_resource_provider
nova.tests.functional.db.test_resource_provider.ResourceProviderTestCase.test_set_inventory_over_capacity
nova.tests.functional.db.test_resource_provider.ResourceProviderTestCase.test_update_inventory_not_found
nova.tests.functional.db.test_resource_provider.TestAllocationListCreateDelete.test_allocation_list_create
nova.tests.functional.regressions.test_bug_1554631.TestCinderForbidden.test_forbidden_cinder_operation_returns_403
nova.tests.functional.regressions.test_bug_1554631.TestCinderOverLimit.test_over_limit_snapshots
nova.tests.functional.regressions.test_bug_1554631.TestCinderOverLimit.test_over_limit_snapshots_force
nova.tests.functional.regressions.test_bug_1554631.TestCinderOverLimit.test_over_limit_volumes
nova.tests.functional.test_server_group.ServerGroupTestV21.test_evacuate_with_affinity_no_valid_host
nova.tests.functional.test_server_group.ServerGroupTestV21.test_evacuate_with_anti_affinity
nova.tests.functional.test_server_group.ServerGroupTestV21.test_evacuate_with_anti_affinity_no_valid_host
nova.tests.functional.test_server_group.ServerGroupTestV215.test_evacuate_with_affinity_no_valid_host
nova.tests.functional.test_server_group.ServerGroupTestV215.test_evacuate_with_anti_affinity
nova.tests.functional.test_server_group.ServerGroupTestV215.test_evacuate_with_anti_affinity_no_valid_host
nova.tests.functional.test_server_group.ServerGroupTestV215.test_evacuate_with_soft_affinity
nova.tests.functional.test_server_group.ServerGroupTestV215.test_evacuate_with_soft_anti_affinity
nova.tests.functional.test_servers.ServersTest.test_create_server_with_injected_files
nova.tests.functional.test_servers.ServersTestV21.test_create_server_with_injected_files