From 657c43135fb746cb8a9d1ea5bb365d4693196080 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 26 Nov 2020 14:21:50 +0100 Subject: [PATCH] explicit import of unittest --- test/integration/component/cpu_limits/__init__.py | 2 +- test/integration/component/find_hosts_for_migration.py | 5 +++-- test/integration/component/maint/__init__.py | 2 +- test/integration/component/maint/test_bugs.py | 3 ++- .../integration/component/maint/test_capacity_host_delete.py | 3 ++- .../component/maint/test_dedicate_guest_vlan_ranges.py | 3 ++- .../component/maint/test_dedicate_public_ip_range.py | 3 ++- .../integration/component/maint/test_escalation_templates.py | 3 ++- test/integration/component/maint/test_escalations_hosts.py | 3 ++- test/integration/component/maint/test_high_availability.py | 3 ++- .../component/maint/test_host_high_availability.py | 3 ++- .../component/maint/test_ip_resource_count_for_vpc.py | 3 ++- test/integration/component/maint/test_multiple_ip_ranges.py | 3 ++- .../integration/component/maint/test_vpc_host_maintenance.py | 3 ++- .../component/maint/test_vpc_on_host_maintenance.py | 3 ++- .../component/maint/testpath_disablestoragepool.py | 3 ++- test/integration/component/maint/testpath_vMotion_vmware.py | 3 ++- .../component/test_acquire_specified_public_ip.py | 3 ++- test/integration/component/test_add_remove_network.py | 3 ++- test/integration/component/test_advancedsg_networks.py | 3 ++- test/integration/component/test_affinity_groups.py | 3 ++- test/integration/component/test_affinity_groups_projects.py | 3 ++- test/integration/component/test_base_image_updation.py | 3 ++- test/integration/component/test_blocker_bugs.py | 3 ++- test/integration/component/test_brocade_vcs.py | 3 ++- test/integration/component/test_browse_templates.py | 3 ++- test/integration/component/test_browse_templates2.py | 3 ++- test/integration/component/test_browse_volumes.py | 3 ++- .../integration/component/test_concurrent_snapshots_limit.py | 2 +- test/integration/component/test_cpu_project_limits.py | 3 ++- test/integration/component/test_custom_hostname.py | 3 ++- test/integration/component/test_deploy_vgpu_vm.py | 3 ++- test/integration/component/test_dhcp_dns_offload.py | 3 ++- test/integration/component/test_dynamic_compute_offering.py | 3 ++- test/integration/component/test_egress_fw_rules.py | 3 ++- test/integration/component/test_eip_elb.py | 3 ++- .../component/test_escalation_listTemplateDomainAdmin.py | 2 +- test/integration/component/test_escalations_instances.py | 3 ++- test/integration/component/test_escalations_ipaddresses.py | 3 ++- test/integration/component/test_escalations_snapshots.py | 3 ++- test/integration/component/test_escalations_templates.py | 3 ++- test/integration/component/test_escalations_volumes.py | 3 ++- test/integration/component/test_ip_reservation.py | 3 ++- test/integration/component/test_lb_secondary_ip.py | 3 ++- test/integration/component/test_list_nics.py | 2 +- test/integration/component/test_list_pod.py | 3 ++- test/integration/component/test_memory_limits.py | 3 ++- test/integration/component/test_mm_domain_limits.py | 3 ++- test/integration/component/test_mm_max_limits.py | 3 ++- test/integration/component/test_mm_project_limits.py | 3 ++- test/integration/component/test_multiple_nic_support.py | 3 ++- .../component/test_multiple_subnets_in_isolated_network.py | 3 ++- .../test_multiple_subnets_in_isolated_network_rvr.py | 3 ++- test/integration/component/test_multiple_subnets_in_vpc.py | 3 ++- .../component/test_multiple_subnets_in_vpc_rvr.py | 3 ++- test/integration/component/test_persistent_networks.py | 3 ++- test/integration/component/test_project_limits.py | 3 ++- test/integration/component/test_project_resources.py | 3 ++- test/integration/component/test_project_usage.py | 5 +++-- .../component/test_protocol_number_security_group.py | 3 ++- test/integration/component/test_ps_domain_limits.py | 3 ++- test/integration/component/test_ps_limits.py | 3 ++- test/integration/component/test_ps_max_limits.py | 3 ++- test/integration/component/test_ps_project_limits.py | 3 ++- test/integration/component/test_ps_resize_volume.py | 3 ++- test/integration/component/test_reset_ssh_keypair.py | 3 ++- test/integration/component/test_rootvolume_resize.py | 5 +++-- test/integration/component/test_shared_networks.py | 3 ++- .../integration/component/test_simultaneous_volume_attach.py | 5 +++-- test/integration/component/test_snapshot_gc.py | 3 ++- test/integration/component/test_snapshot_limits.py | 3 ++- test/integration/component/test_ss_limits.py | 3 ++- test/integration/component/test_ss_project_limits.py | 3 ++- .../test_template_from_snapshot_with_template_details.py | 3 ++- test/integration/component/test_templates.py | 3 ++- test/integration/component/test_updateResourceCount.py | 2 +- test/integration/component/test_vm_passwdenabled.py | 3 ++- test/integration/component/test_vmware_drs.py | 3 ++- test/integration/component/test_vpc_network.py | 3 ++- test/integration/component/test_vpc_network_lbrules.py | 3 ++- test/integration/component/test_vpc_network_staticnatrule.py | 3 ++- test/integration/component/test_vpc_vm_life_cycle.py | 3 ++- test/integration/component/test_vpc_vms_deployment.py | 3 ++- test/integration/plugins/ldap/ldap_test_data.py | 2 +- test/integration/smoke/test_create_network.py | 3 ++- test/integration/smoke/test_iso.py | 5 +++-- test/integration/smoke/test_kubernetes_clusters.py | 3 ++- test/integration/smoke/test_kubernetes_supported_versions.py | 3 ++- test/integration/smoke/test_migration.py | 3 ++- test/integration/smoke/test_nic_adapter_type.py | 3 ++- test/integration/smoke/test_scale_vm.py | 2 +- test/integration/smoke/test_templates.py | 3 ++- test/integration/smoke/test_update_security_group.py | 3 ++- test/integration/smoke/test_usage.py | 3 ++- test/integration/smoke/test_volumes.py | 3 ++- test/integration/testpaths/testpath_snapshot_hadrning.py | 3 ++- test/integration/testpaths/testpath_storage_migration.py | 3 ++- .../testpaths/testpath_volume_cuncurrent_snapshots.py | 3 ++- test/integration/testpaths/testpath_volume_recurring_snap.py | 3 ++- test/integration/testpaths/testpath_volume_snapshot.py | 3 ++- test/integration/testpaths/testpath_volumelifecycle.py | 3 ++- 101 files changed, 199 insertions(+), 106 deletions(-) diff --git a/test/integration/component/cpu_limits/__init__.py b/test/integration/component/cpu_limits/__init__.py index d216be4ddc9..13a83393a91 100644 --- a/test/integration/component/cpu_limits/__init__.py +++ b/test/integration/component/cpu_limits/__init__.py @@ -13,4 +13,4 @@ # "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. \ No newline at end of file +# under the License. diff --git a/test/integration/component/find_hosts_for_migration.py b/test/integration/component/find_hosts_for_migration.py index 50789b2bf3b..875d5cf1781 100644 --- a/test/integration/component/find_hosts_for_migration.py +++ b/test/integration/component/find_hosts_for_migration.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (migrateVirtualMachine, prepareHostForMaintenance, cancelHostMaintenance, @@ -270,4 +271,4 @@ class TestHostsForMigration(cloudstackTestCase): self.assertTrue(notSuitableHost is not None, "notsuitablehost should not be None") self.debug("Suitable Hosts: %s" % suitableHost) - self.debug("Not suitable Hosts: %s" % notSuitableHost) \ No newline at end of file + self.debug("Not suitable Hosts: %s" % notSuitableHost) diff --git a/test/integration/component/maint/__init__.py b/test/integration/component/maint/__init__.py index f044f8bcd9a..2b7631b1612 100644 --- a/test/integration/component/maint/__init__.py +++ b/test/integration/component/maint/__init__.py @@ -18,4 +18,4 @@ """ Tests that put hosts, zones, resources in to maintenance mode are here. These will have to be run sequentiall when resources are available so as not disrupt other tests -""" \ No newline at end of file +""" diff --git a/test/integration/component/maint/test_bugs.py b/test/integration/component/maint/test_bugs.py index ab3f7e797a5..b839dbe6a6c 100644 --- a/test/integration/component/maint/test_bugs.py +++ b/test/integration/component/maint/test_bugs.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (updateStoragePool, resizeVolume, listCapacity, diff --git a/test/integration/component/maint/test_capacity_host_delete.py b/test/integration/component/maint/test_capacity_host_delete.py index aba5152e35f..2745adb8a28 100644 --- a/test/integration/component/maint/test_capacity_host_delete.py +++ b/test/integration/component/maint/test_capacity_host_delete.py @@ -18,7 +18,8 @@ # Test from the Marvin - Testing in Python wiki # All tests inherit from cloudstackTestCase -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest # Import Integration Libraries diff --git a/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py b/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py index 9a0e7f09ff3..a90082ad128 100644 --- a/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py +++ b/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py @@ -24,7 +24,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, cleanup_resources, random_gen, diff --git a/test/integration/component/maint/test_dedicate_public_ip_range.py b/test/integration/component/maint/test_dedicate_public_ip_range.py index fe6b5d57616..cde2b789c1d 100644 --- a/test/integration/component/maint/test_dedicate_public_ip_range.py +++ b/test/integration/component/maint/test_dedicate_public_ip_range.py @@ -26,7 +26,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, cleanup_resources, random_gen) diff --git a/test/integration/component/maint/test_escalation_templates.py b/test/integration/component/maint/test_escalation_templates.py index 16395540a2c..68012c0b091 100644 --- a/test/integration/component/maint/test_escalation_templates.py +++ b/test/integration/component/maint/test_escalation_templates.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, Domain, Template, Configurations,VirtualMachine,Snapshot,ServiceOffering ) diff --git a/test/integration/component/maint/test_escalations_hosts.py b/test/integration/component/maint/test_escalations_hosts.py index bdc10744b3f..4d07517a258 100644 --- a/test/integration/component/maint/test_escalations_hosts.py +++ b/test/integration/component/maint/test_escalations_hosts.py @@ -18,7 +18,8 @@ # Test from the Marvin - Testing in Python wiki # All tests inherit from cloudstackTestCase -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest # Import Integration Libraries diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py index 7d662c7fb2e..35ba3d7f35d 100644 --- a/test/integration/component/maint/test_high_availability.py +++ b/test/integration/component/maint/test_high_availability.py @@ -20,7 +20,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (prepareHostForMaintenance, cancelHostMaintenance) from marvin.lib.utils import cleanup_resources diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py index 8d20a609e15..c95b5db89b6 100644 --- a/test/integration/component/maint/test_host_high_availability.py +++ b/test/integration/component/maint/test_host_high_availability.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (migrateVirtualMachine, prepareHostForMaintenance, cancelHostMaintenance) diff --git a/test/integration/component/maint/test_ip_resource_count_for_vpc.py b/test/integration/component/maint/test_ip_resource_count_for_vpc.py index 9f853fa44eb..3557931ee4c 100644 --- a/test/integration/component/maint/test_ip_resource_count_for_vpc.py +++ b/test/integration/component/maint/test_ip_resource_count_for_vpc.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (VirtualMachine, NetworkOffering, VpcOffering, diff --git a/test/integration/component/maint/test_multiple_ip_ranges.py b/test/integration/component/maint/test_multiple_ip_ranges.py index ef38fcc956d..36e742479b8 100644 --- a/test/integration/component/maint/test_multiple_ip_ranges.py +++ b/test/integration/component/maint/test_multiple_ip_ranges.py @@ -16,7 +16,8 @@ # under the License. """ Tests for Multiple IP Ranges feature """ -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources, get_process_status from marvin.lib.base import (Account, DiskOffering, diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py index c5900eb1018..37dc950c1ab 100644 --- a/test/integration/component/maint/test_vpc_host_maintenance.py +++ b/test/integration/component/maint/test_vpc_host_maintenance.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import migrateSystemVm from marvin.lib.utils import cleanup_resources from marvin.lib.base import (Host, diff --git a/test/integration/component/maint/test_vpc_on_host_maintenance.py b/test/integration/component/maint/test_vpc_on_host_maintenance.py index 3735b6882a0..e1312e9e40f 100644 --- a/test/integration/component/maint/test_vpc_on_host_maintenance.py +++ b/test/integration/component/maint/test_vpc_on_host_maintenance.py @@ -16,7 +16,8 @@ # under the License. from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources from marvin.lib.base import (Account, Host, diff --git a/test/integration/component/maint/testpath_disablestoragepool.py b/test/integration/component/maint/testpath_disablestoragepool.py index c1bb2040b6f..795003eec72 100644 --- a/test/integration/component/maint/testpath_disablestoragepool.py +++ b/test/integration/component/maint/testpath_disablestoragepool.py @@ -19,7 +19,8 @@ # All tests inherit from cloudstack TestCase from marvin.cloudstackTestCase import cloudstackTestCase -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.codes import FAILED, PASS from marvin.lib.base import (Account, VirtualMachine, diff --git a/test/integration/component/maint/testpath_vMotion_vmware.py b/test/integration/component/maint/testpath_vMotion_vmware.py index 27c85ffbb15..4768319d1f6 100644 --- a/test/integration/component/maint/testpath_vMotion_vmware.py +++ b/test/integration/component/maint/testpath_vMotion_vmware.py @@ -17,7 +17,8 @@ """ Test cases for Test Paths Storage Migration """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, validateList, is_server_ssh_ready diff --git a/test/integration/component/test_acquire_specified_public_ip.py b/test/integration/component/test_acquire_specified_public_ip.py index 01a4470f161..4482e16ea85 100644 --- a/test/integration/component/test_acquire_specified_public_ip.py +++ b/test/integration/component/test_acquire_specified_public_ip.py @@ -21,7 +21,8 @@ Tests of acquiring a specified public IP for isolated network or vpc # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import createVlanIpRange from marvin.lib.utils import (validateList, cleanup_resources) diff --git a/test/integration/component/test_add_remove_network.py b/test/integration/component/test_add_remove_network.py index b5c4c933187..29930b2df01 100644 --- a/test/integration/component/test_add_remove_network.py +++ b/test/integration/component/test_add_remove_network.py @@ -27,7 +27,8 @@ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from ddt import ddt, data from marvin.lib.base import ( Account, diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py index 16bf0ee3def..6a885121212 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -17,7 +17,8 @@ """ P1 tests for networks in advanced zone with security groups """ -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from ddt import ddt, data from marvin.lib.base import (Zone, ServiceOffering, diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py index ee81b79cbe5..445364877a7 100644 --- a/test/integration/component/test_affinity_groups.py +++ b/test/integration/component/test_affinity_groups.py @@ -15,7 +15,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import deleteAffinityGroup from marvin.lib.utils import (cleanup_resources, random_gen) diff --git a/test/integration/component/test_affinity_groups_projects.py b/test/integration/component/test_affinity_groups_projects.py index 00859466fe4..16135e24e96 100644 --- a/test/integration/component/test_affinity_groups_projects.py +++ b/test/integration/component/test_affinity_groups_projects.py @@ -15,7 +15,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import deleteAffinityGroup from marvin.lib.utils import (cleanup_resources, random_gen) diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py index ae57d435b05..133db821267 100644 --- a/test/integration/component/test_base_image_updation.py +++ b/test/integration/component/test_base_image_updation.py @@ -28,7 +28,8 @@ from marvin.codes import (PASS, RECURRING) from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (ServiceOffering, Account, diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index dce6781d064..cffb488e3ba 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -36,7 +36,8 @@ from marvin.lib.common import (get_zone, get_builtin_template_info) #Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import restartNetwork from marvin.codes import PASS import time diff --git a/test/integration/component/test_brocade_vcs.py b/test/integration/component/test_brocade_vcs.py index adaf21bda5e..1b2dcebe66e 100644 --- a/test/integration/component/test_brocade_vcs.py +++ b/test/integration/component/test_brocade_vcs.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (listPhysicalNetworks, listNetworkServiceProviders, addNetworkServiceProvider, diff --git a/test/integration/component/test_browse_templates.py b/test/integration/component/test_browse_templates.py index 243d961bf20..3bceb44fc73 100644 --- a/test/integration/component/test_browse_templates.py +++ b/test/integration/component/test_browse_templates.py @@ -20,7 +20,8 @@ import marvin from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import * from marvin.lib.utils import * from marvin.lib.base import * diff --git a/test/integration/component/test_browse_templates2.py b/test/integration/component/test_browse_templates2.py index d427c3a1130..0aa7bee18a6 100644 --- a/test/integration/component/test_browse_templates2.py +++ b/test/integration/component/test_browse_templates2.py @@ -19,7 +19,8 @@ import marvin from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import * from marvin.lib.utils import * from marvin.lib.base import * diff --git a/test/integration/component/test_browse_volumes.py b/test/integration/component/test_browse_volumes.py index 2a65cb8dbc7..09ed681ed40 100644 --- a/test/integration/component/test_browse_volumes.py +++ b/test/integration/component/test_browse_volumes.py @@ -20,7 +20,8 @@ import marvin from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import * from marvin.lib.utils import * from marvin.lib.base import * diff --git a/test/integration/component/test_concurrent_snapshots_limit.py b/test/integration/component/test_concurrent_snapshots_limit.py index fce1dd4439a..d154e8b2a5f 100644 --- a/test/integration/component/test_concurrent_snapshots_limit.py +++ b/test/integration/component/test_concurrent_snapshots_limit.py @@ -309,4 +309,4 @@ class TestConcurrentSnapshotLimit(cloudstackTestCase): "concurrent.snapshots.threshold.perhost", "String" ) - return \ No newline at end of file + return diff --git a/test/integration/component/test_cpu_project_limits.py b/test/integration/component/test_cpu_project_limits.py index 8a43b7680bd..5781e6af077 100644 --- a/test/integration/component/test_cpu_project_limits.py +++ b/test/integration/component/test_cpu_project_limits.py @@ -19,7 +19,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py index ac85b8c37f9..7d71c581e95 100644 --- a/test/integration/component/test_custom_hostname.py +++ b/test/integration/component/test_custom_hostname.py @@ -19,7 +19,8 @@ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, random_gen, get_hypervisor_type) diff --git a/test/integration/component/test_deploy_vgpu_vm.py b/test/integration/component/test_deploy_vgpu_vm.py index de47c42256c..2c1f124e8ef 100644 --- a/test/integration/component/test_deploy_vgpu_vm.py +++ b/test/integration/component/test_deploy_vgpu_vm.py @@ -18,7 +18,8 @@ # Test from the Marvin - Testing in Python wiki # All tests inherit from cloudstackTestCase -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import changeServiceForVirtualMachine, startVirtualMachine # Import Integration Libraries diff --git a/test/integration/component/test_dhcp_dns_offload.py b/test/integration/component/test_dhcp_dns_offload.py index 941f6ec418e..d012bcb1763 100644 --- a/test/integration/component/test_dhcp_dns_offload.py +++ b/test/integration/component/test_dhcp_dns_offload.py @@ -16,7 +16,8 @@ # under the License. """ Tests for DHCP DNS offload feature """ -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (random_gen, validateList, cleanup_resources, get_hypervisor_type) from marvin.lib.base import (Account, NIC, diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py index 1889fbfbea5..1f8740c9c42 100644 --- a/test/integration/component/test_dynamic_compute_offering.py +++ b/test/integration/component/test_dynamic_compute_offering.py @@ -25,7 +25,8 @@ Feature Specifications: https://cwiki.apache.org/confluence/display/ CLOUDSTACK/Dynamic+Compute+Offering+FS """ -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, validateList, random_gen, diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py index f3bce20afd4..fc64cc6a3df 100644 --- a/test/integration/component/test_egress_fw_rules.py +++ b/test/integration/component/test_egress_fw_rules.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, Domain, Router, diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py index 2cfad77391a..e0b54317b76 100644 --- a/test/integration/component/test_eip_elb.py +++ b/test/integration/component/test_eip_elb.py @@ -19,7 +19,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (authorizeSecurityGroupIngress, disassociateIpAddress, deleteLoadBalancerRule) diff --git a/test/integration/component/test_escalation_listTemplateDomainAdmin.py b/test/integration/component/test_escalation_listTemplateDomainAdmin.py index f0c492989be..2148a607357 100644 --- a/test/integration/component/test_escalation_listTemplateDomainAdmin.py +++ b/test/integration/component/test_escalation_listTemplateDomainAdmin.py @@ -164,4 +164,4 @@ class TestlistTemplatesDomainAdmin(cloudstackTestCase): else: retries = retries - 1 - raise Exception("Template download failed exception.") \ No newline at end of file + raise Exception("Template download failed exception.") diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py index 331c51b694b..20f398c77bb 100644 --- a/test/integration/component/test_escalations_instances.py +++ b/test/integration/component/test_escalations_instances.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources, validateList from marvin.lib.base import (Account, ServiceOffering, diff --git a/test/integration/component/test_escalations_ipaddresses.py b/test/integration/component/test_escalations_ipaddresses.py index 3975eb43f2a..059843ad504 100644 --- a/test/integration/component/test_escalations_ipaddresses.py +++ b/test/integration/component/test_escalations_ipaddresses.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (PublicIPAddress, NetworkOffering, Autoscale, diff --git a/test/integration/component/test_escalations_snapshots.py b/test/integration/component/test_escalations_snapshots.py index cf25560fb45..33ff79dadab 100644 --- a/test/integration/component/test_escalations_snapshots.py +++ b/test/integration/component/test_escalations_snapshots.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (VmSnapshot, Snapshot, DiskOffering, diff --git a/test/integration/component/test_escalations_templates.py b/test/integration/component/test_escalations_templates.py index 1157157612d..bd7c4180345 100644 --- a/test/integration/component/test_escalations_templates.py +++ b/test/integration/component/test_escalations_templates.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, validateList) from marvin.lib.base import (Account, diff --git a/test/integration/component/test_escalations_volumes.py b/test/integration/component/test_escalations_volumes.py index df5f7805874..6d62d31a689 100644 --- a/test/integration/component/test_escalations_volumes.py +++ b/test/integration/component/test_escalations_volumes.py @@ -16,7 +16,8 @@ # under the License. # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import createVolume, createTemplate from marvin.lib.utils import (cleanup_resources, random_gen, validateList) diff --git a/test/integration/component/test_ip_reservation.py b/test/integration/component/test_ip_reservation.py index 7a3c242cd8a..c5341516f3a 100644 --- a/test/integration/component/test_ip_reservation.py +++ b/test/integration/component/test_ip_reservation.py @@ -22,7 +22,8 @@ Feature Specifications: https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+IP+Range+Reservation+within+a+Network """ -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import validateList, cleanup_resources, verifyRouterState from marvin.lib.base import (Account, Network, diff --git a/test/integration/component/test_lb_secondary_ip.py b/test/integration/component/test_lb_secondary_ip.py index e1d885d62ef..991466decd1 100644 --- a/test/integration/component/test_lb_secondary_ip.py +++ b/test/integration/component/test_lb_secondary_ip.py @@ -30,7 +30,8 @@ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_list_nics.py b/test/integration/component/test_list_nics.py index 12bae1fa2ea..a93c07bfc4b 100644 --- a/test/integration/component/test_list_nics.py +++ b/test/integration/component/test_list_nics.py @@ -147,4 +147,4 @@ class TestDeployVM(cloudstackTestCase): cleanup_resources(self.apiclient, self.cleanup) except Exception as e: self.debug("Warning! Exception in tearDown: %s" % e) - return \ No newline at end of file + return diff --git a/test/integration/component/test_list_pod.py b/test/integration/component/test_list_pod.py index 07ab2c589af..ac8a8895c6b 100644 --- a/test/integration/component/test_list_pod.py +++ b/test/integration/component/test_list_pod.py @@ -19,7 +19,8 @@ """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources) from marvin.lib.base import (Pod, Cluster, Capacities) from marvin.cloudstackAPI import (updateConfiguration) diff --git a/test/integration/component/test_memory_limits.py b/test/integration/component/test_memory_limits.py index d18c0ab005b..fca2ca61009 100644 --- a/test/integration/component/test_memory_limits.py +++ b/test/integration/component/test_memory_limits.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_mm_domain_limits.py b/test/integration/component/test_mm_domain_limits.py index f9cf1064179..73ef3ecfed1 100644 --- a/test/integration/component/test_mm_domain_limits.py +++ b/test/integration/component/test_mm_domain_limits.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_mm_max_limits.py b/test/integration/component/test_mm_max_limits.py index e08052b2f8e..b831e0b0ab3 100644 --- a/test/integration/component/test_mm_max_limits.py +++ b/test/integration/component/test_mm_max_limits.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_mm_project_limits.py b/test/integration/component/test_mm_project_limits.py index 0d5b282f5b4..09acf058669 100644 --- a/test/integration/component/test_mm_project_limits.py +++ b/test/integration/component/test_mm_project_limits.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py index d38693c9cb1..6c99999e2d8 100644 --- a/test/integration/component/test_multiple_nic_support.py +++ b/test/integration/component/test_multiple_nic_support.py @@ -19,7 +19,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.sshClient import SshClient from marvin.lib.utils import (validateList, cleanup_resources, diff --git a/test/integration/component/test_multiple_subnets_in_isolated_network.py b/test/integration/component/test_multiple_subnets_in_isolated_network.py index 9a35bc519a0..80334955a81 100644 --- a/test/integration/component/test_multiple_subnets_in_isolated_network.py +++ b/test/integration/component/test_multiple_subnets_in_isolated_network.py @@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc from nose.plugins.attrib import attr from marvin.cloudstackAPI import rebootRouter -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, get_host_credentials, get_process_status, diff --git a/test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py b/test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py index 2114df58602..0565b98d8e4 100644 --- a/test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py +++ b/test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py @@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc from nose.plugins.attrib import attr from marvin.cloudstackAPI import rebootRouter -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, get_host_credentials, get_process_status, diff --git a/test/integration/component/test_multiple_subnets_in_vpc.py b/test/integration/component/test_multiple_subnets_in_vpc.py index f3f9864ccdb..f20f7c4a8bc 100644 --- a/test/integration/component/test_multiple_subnets_in_vpc.py +++ b/test/integration/component/test_multiple_subnets_in_vpc.py @@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc from nose.plugins.attrib import attr from marvin.cloudstackAPI import rebootRouter -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, get_host_credentials, get_process_status, diff --git a/test/integration/component/test_multiple_subnets_in_vpc_rvr.py b/test/integration/component/test_multiple_subnets_in_vpc_rvr.py index 1e2e9151cf4..ca7731472b6 100644 --- a/test/integration/component/test_multiple_subnets_in_vpc_rvr.py +++ b/test/integration/component/test_multiple_subnets_in_vpc_rvr.py @@ -21,7 +21,8 @@ Tests of acquiring IPs in multiple subnets for isolated network or vpc from nose.plugins.attrib import attr from marvin.cloudstackAPI import rebootRouter -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (validateList, get_host_credentials, get_process_status, diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py index 69ed493fb15..c25ce2dc350 100644 --- a/test/integration/component/test_persistent_networks.py +++ b/test/integration/component/test_persistent_networks.py @@ -44,7 +44,8 @@ from marvin.lib.common import (get_domain, from nose.plugins.attrib import attr from marvin.codes import PASS, FAIL, FAILED from marvin.sshClient import SshClient -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from ddt import ddt, data import time diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index ad4e75de025..955c4dd0861 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -18,7 +18,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest #from marvin.cloudstackAPI import * from marvin.lib.utils import (cleanup_resources, validateList) diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index 607c684f8ce..0b7d9a7fdbe 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -18,7 +18,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (VirtualMachine, Account, Project, diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index 829cbc7e09a..10028ed92a3 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -18,7 +18,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import deleteVolume from marvin.lib.utils import (cleanup_resources, validateList) from marvin.lib.base import (Project, @@ -2026,4 +2027,4 @@ class TestVMSnapshotUsage(cloudstackTestCase): 1, "Check VM.SNAPSHOT.DELETE in events table" ) - return \ No newline at end of file + return diff --git a/test/integration/component/test_protocol_number_security_group.py b/test/integration/component/test_protocol_number_security_group.py index 60296753845..69c07c2263c 100644 --- a/test/integration/component/test_protocol_number_security_group.py +++ b/test/integration/component/test_protocol_number_security_group.py @@ -21,7 +21,8 @@ Tests protocol number support for security groups # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import authorizeSecurityGroupIngress, revokeSecurityGroupIngress, authorizeSecurityGroupEgress, revokeSecurityGroupEgress from marvin.sshClient import SshClient from marvin.lib.utils import (validateList, diff --git a/test/integration/component/test_ps_domain_limits.py b/test/integration/component/test_ps_domain_limits.py index 75623c0da04..9740ab9557d 100644 --- a/test/integration/component/test_ps_domain_limits.py +++ b/test/integration/component/test_ps_domain_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_ps_limits.py b/test/integration/component/test_ps_limits.py index 983f72aa7aa..0211e909bb0 100644 --- a/test/integration/component/test_ps_limits.py +++ b/test/integration/component/test_ps_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/component/test_ps_max_limits.py b/test/integration/component/test_ps_max_limits.py index 5fb84228a89..d8d8992f70a 100644 --- a/test/integration/component/test_ps_max_limits.py +++ b/test/integration/component/test_ps_max_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_ps_project_limits.py b/test/integration/component/test_ps_project_limits.py index c79e3b881fe..d549467d55c 100644 --- a/test/integration/component/test_ps_project_limits.py +++ b/test/integration/component/test_ps_project_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_ps_resize_volume.py b/test/integration/component/test_ps_resize_volume.py index c396016ad0a..f691dd9fd67 100644 --- a/test/integration/component/test_ps_resize_volume.py +++ b/test/integration/component/test_ps_resize_volume.py @@ -28,7 +28,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py index db7e9b82d98..23f19743fc6 100644 --- a/test/integration/component/test_reset_ssh_keypair.py +++ b/test/integration/component/test_reset_ssh_keypair.py @@ -32,7 +32,8 @@ from marvin.lib.common import (get_domain, from marvin.lib.utils import (cleanup_resources, random_gen, validateList) -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.codes import PASS, RUNNING #Import System modules diff --git a/test/integration/component/test_rootvolume_resize.py b/test/integration/component/test_rootvolume_resize.py index 858a6a65f6b..f5bd47d1146 100644 --- a/test/integration/component/test_rootvolume_resize.py +++ b/test/integration/component/test_rootvolume_resize.py @@ -24,7 +24,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, @@ -1140,4 +1141,4 @@ class TestResizeVolume(cloudstackTestCase): " storage capacity after root " "volume resize : %s" % e) - return \ No newline at end of file + return diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py index ec478a0ef5e..725ee9162aa 100644 --- a/test/integration/component/test_shared_networks.py +++ b/test/integration/component/test_shared_networks.py @@ -18,7 +18,8 @@ """ P1 tests for shared networks """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import rebootRouter, stopRouter, startRouter from marvin.lib.base import (Account, Network, diff --git a/test/integration/component/test_simultaneous_volume_attach.py b/test/integration/component/test_simultaneous_volume_attach.py index 7ccde9cc785..aee5cf60026 100644 --- a/test/integration/component/test_simultaneous_volume_attach.py +++ b/test/integration/component/test_simultaneous_volume_attach.py @@ -17,7 +17,8 @@ #Import Local Modules from marvin.cloudstackAPI import * -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, validateList) from marvin.lib.base import (ServiceOffering, @@ -252,4 +253,4 @@ class TestMultipleVolumeAttach(cloudstackTestCase): "All 4 data disks are not attached to VM Successfully" ) - return \ No newline at end of file + return diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py index 15c3f1c20cc..1e08c046e07 100644 --- a/test/integration/component/test_snapshot_gc.py +++ b/test/integration/component/test_snapshot_gc.py @@ -16,7 +16,8 @@ # under the License. from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest #from marvin.cloudstackAPI import * from marvin.lib.utils import ( is_snapshot_on_nfs, diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py index c5ba6a7897c..eb036605e91 100644 --- a/test/integration/component/test_snapshot_limits.py +++ b/test/integration/component/test_snapshot_limits.py @@ -16,7 +16,8 @@ # under the License. from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources from marvin.lib.base import (Account, VirtualMachine, diff --git a/test/integration/component/test_ss_limits.py b/test/integration/component/test_ss_limits.py index bd61398aac2..3d35d4337aa 100644 --- a/test/integration/component/test_ss_limits.py +++ b/test/integration/component/test_ss_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_ss_project_limits.py b/test/integration/component/test_ss_project_limits.py index ca58dbd7dcb..289c4c1778a 100644 --- a/test/integration/component/test_ss_project_limits.py +++ b/test/integration/component/test_ss_project_limits.py @@ -25,7 +25,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, diff --git a/test/integration/component/test_template_from_snapshot_with_template_details.py b/test/integration/component/test_template_from_snapshot_with_template_details.py index 4e20261ea9b..6b03860319a 100644 --- a/test/integration/component/test_template_from_snapshot_with_template_details.py +++ b/test/integration/component/test_template_from_snapshot_with_template_details.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import listZones from marvin.lib.utils import (cleanup_resources) from marvin.lib.base import (Account, diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 496c1d605af..f5e2d4625ce 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -18,7 +18,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import listZones from marvin.lib.utils import (cleanup_resources) from marvin.lib.base import (Account, diff --git a/test/integration/component/test_updateResourceCount.py b/test/integration/component/test_updateResourceCount.py index c9bd6e6f183..cc024681843 100644 --- a/test/integration/component/test_updateResourceCount.py +++ b/test/integration/component/test_updateResourceCount.py @@ -232,4 +232,4 @@ class TestUpdateResourceCount(cloudstackTestCase): 1024, "The memory amount does not seem to be right." ) - return \ No newline at end of file + return diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index d340031935c..20dcbd73d5f 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -14,7 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources from marvin.lib.base import (Account, ServiceOffering, diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py index 5d701e89340..9ec84ef4639 100644 --- a/test/integration/component/test_vmware_drs.py +++ b/test/integration/component/test_vmware_drs.py @@ -21,7 +21,8 @@ import marvin from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, AffinityGroup, diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py index 1dbccf8fc45..4f31738d0b4 100644 --- a/test/integration/component/test_vpc_network.py +++ b/test/integration/component/test_vpc_network.py @@ -19,7 +19,8 @@ """ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import startVirtualMachine, stopVirtualMachine from marvin.lib.utils import cleanup_resources, validateList from marvin.lib.base import (VirtualMachine, diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py index afdc57cda10..9d3ec51bd03 100644 --- a/test/integration/component/test_vpc_network_lbrules.py +++ b/test/integration/component/test_vpc_network_lbrules.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (stopRouter, startRouter, Account, diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index 788f1c80b79..c5f39b34499 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -18,7 +18,8 @@ """ Component tests for VPC network functionality - Port Forwarding Rules. """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (Account, VpcOffering, VPC, diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py index ae8ee2b5fbd..bdc1c9f8f7a 100644 --- a/test/integration/component/test_vpc_vm_life_cycle.py +++ b/test/integration/component/test_vpc_vm_life_cycle.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import cleanup_resources, validateList from marvin.lib.base import (VirtualMachine, NATRule, diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index 9afb17a9d17..66d3e0c5837 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -19,7 +19,8 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import (VirtualMachine, NetworkOffering, VpcOffering, diff --git a/test/integration/plugins/ldap/ldap_test_data.py b/test/integration/plugins/ldap/ldap_test_data.py index bfb89d58ae1..15dec9e2419 100644 --- a/test/integration/plugins/ldap/ldap_test_data.py +++ b/test/integration/plugins/ldap/ldap_test_data.py @@ -186,4 +186,4 @@ class LdapTestData: LdapTestData.group : LdapTestData.seniors } ], - } \ No newline at end of file + } diff --git a/test/integration/smoke/test_create_network.py b/test/integration/smoke/test_create_network.py index 7fe7cbbc53a..497679fc0eb 100644 --- a/test/integration/smoke/test_create_network.py +++ b/test/integration/smoke/test_create_network.py @@ -17,7 +17,8 @@ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.sshClient import SshClient from marvin.lib.utils import (cleanup_resources, random_gen) diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py index a6c7230d512..c592b6bc606 100644 --- a/test/integration/smoke/test_iso.py +++ b/test/integration/smoke/test_iso.py @@ -18,7 +18,8 @@ """ # Import Local Modules from marvin.cloudstackException import GetDetailExceptionInfo -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import listZones, updateIso, extractIso, updateIsoPermissions, copyIso, deleteIso,\ registerIso,listOsTypes from marvin.lib.utils import cleanup_resources, random_gen, get_hypervisor_type,validateList @@ -775,4 +776,4 @@ class TestCreateISOWithChecksum(cloudstackTestCase): else: retries = retries - 1 - raise Exception("Template download failed exception.") \ No newline at end of file + raise Exception("Template download failed exception.") diff --git a/test/integration/smoke/test_kubernetes_clusters.py b/test/integration/smoke/test_kubernetes_clusters.py index 010b5ae25cf..f469756d10c 100644 --- a/test/integration/smoke/test_kubernetes_clusters.py +++ b/test/integration/smoke/test_kubernetes_clusters.py @@ -17,7 +17,8 @@ """ Tests for Kubernetes supported version """ #Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (listInfrastructure, listTemplates, listKubernetesSupportedVersions, diff --git a/test/integration/smoke/test_kubernetes_supported_versions.py b/test/integration/smoke/test_kubernetes_supported_versions.py index ffeb00599d4..a6e47866673 100644 --- a/test/integration/smoke/test_kubernetes_supported_versions.py +++ b/test/integration/smoke/test_kubernetes_supported_versions.py @@ -17,7 +17,8 @@ """ Tests for Kubernetes supported version """ #Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import (listInfrastructure, listKubernetesSupportedVersions, addKubernetesSupportedVersion, diff --git a/test/integration/smoke/test_migration.py b/test/integration/smoke/test_migration.py index dcf386a9d87..3b21a0b3936 100644 --- a/test/integration/smoke/test_migration.py +++ b/test/integration/smoke/test_migration.py @@ -18,7 +18,8 @@ """ Network migration test """ # Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/smoke/test_nic_adapter_type.py b/test/integration/smoke/test_nic_adapter_type.py index 933b8d97894..0101cfecbcc 100644 --- a/test/integration/smoke/test_nic_adapter_type.py +++ b/test/integration/smoke/test_nic_adapter_type.py @@ -22,7 +22,8 @@ # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.base import ( Account, ServiceOffering, diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py index ddd6bcfbc71..ee0e49ec1af 100644 --- a/test/integration/smoke/test_scale_vm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -209,4 +209,4 @@ class TestScaleVm(cloudstackTestCase): 'Running', "Check the state of VM" ) - return \ No newline at end of file + return diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index 1594d76328d..3243b5ca0e3 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -20,7 +20,8 @@ from marvin.cloudstackException import * from marvin.cloudstackAPI import * from marvin.codes import FAILED -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import listZones from marvin.lib.utils import random_gen, cleanup_resources from marvin.lib.base import (Account, diff --git a/test/integration/smoke/test_update_security_group.py b/test/integration/smoke/test_update_security_group.py index 41e4d596907..95bf7b2d924 100644 --- a/test/integration/smoke/test_update_security_group.py +++ b/test/integration/smoke/test_update_security_group.py @@ -21,7 +21,8 @@ Tests for updating security group name # Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import updateSecurityGroup, createSecurityGroup from marvin.sshClient import SshClient from marvin.lib.utils import (validateList, diff --git a/test/integration/smoke/test_usage.py b/test/integration/smoke/test_usage.py index 54139e4737f..2100859ba52 100644 --- a/test/integration/smoke/test_usage.py +++ b/test/integration/smoke/test_usage.py @@ -19,7 +19,8 @@ # Import Local Modules from marvin.codes import FAILED from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.cloudstackAPI import deleteVolume from marvin.lib.utils import (cleanup_resources,get_hypervisor_type) from marvin.lib.base import (Account, diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index 67449a1f026..f66985233d4 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -17,7 +17,8 @@ """ BVT tests for Volumes """ #Import Local Modules -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest #from marvin.cloudstackException import * from marvin.cloudstackAPI import (deleteVolume, extractVolume, diff --git a/test/integration/testpaths/testpath_snapshot_hadrning.py b/test/integration/testpaths/testpath_snapshot_hadrning.py index d87dcc1f529..feca9373e40 100755 --- a/test/integration/testpaths/testpath_snapshot_hadrning.py +++ b/test/integration/testpaths/testpath_snapshot_hadrning.py @@ -18,7 +18,8 @@ """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, is_snapshot_on_nfs, validateList) diff --git a/test/integration/testpaths/testpath_storage_migration.py b/test/integration/testpaths/testpath_storage_migration.py index 799f1bea764..e9817f80039 100644 --- a/test/integration/testpaths/testpath_storage_migration.py +++ b/test/integration/testpaths/testpath_storage_migration.py @@ -17,7 +17,8 @@ """ Test cases for Test Paths Storage Migration """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources) from marvin.lib.base import (Account, ServiceOffering, diff --git a/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py b/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py index ffc6fd0615a..2c0d39bd048 100644 --- a/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py +++ b/test/integration/testpaths/testpath_volume_cuncurrent_snapshots.py @@ -19,7 +19,8 @@ """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, is_snapshot_on_nfs, validateList) from marvin.lib.base import (Account, diff --git a/test/integration/testpaths/testpath_volume_recurring_snap.py b/test/integration/testpaths/testpath_volume_recurring_snap.py index 23e0b3a73ac..828d4cf7266 100644 --- a/test/integration/testpaths/testpath_volume_recurring_snap.py +++ b/test/integration/testpaths/testpath_volume_recurring_snap.py @@ -17,7 +17,8 @@ """ Test cases for VM/Volume recurring snapshot Test Path """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, is_snapshot_on_nfs, validateList diff --git a/test/integration/testpaths/testpath_volume_snapshot.py b/test/integration/testpaths/testpath_volume_snapshot.py index c0e609a289b..a9b0ae3cb48 100644 --- a/test/integration/testpaths/testpath_volume_snapshot.py +++ b/test/integration/testpaths/testpath_volume_snapshot.py @@ -17,7 +17,8 @@ """ Test cases for VM/Volume snapshot Test Path """ from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest from marvin.lib.utils import (cleanup_resources, is_snapshot_on_nfs, validateList) diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py index 6bf19ea076e..78733fcc968 100644 --- a/test/integration/testpaths/testpath_volumelifecycle.py +++ b/test/integration/testpaths/testpath_volumelifecycle.py @@ -17,7 +17,8 @@ """Utilities functions """ # All tests inherit from cloudstackTestCase -from marvin.cloudstackTestCase import cloudstackTestCase, unittest +from marvin.cloudstackTestCase import cloudstackTestCase +import unittest # Import Integration Libraries from marvin.codes import FAILED, PASS # base - contains all resources as entities and defines create, delete,