Update imports and body of test_compare_vms to use Comparable

cfme/tests/infrastructure/test_vm_compare.py

@@ -1,17 +1,11 @@
-import fauxfactory
 import pytest
-from widgetastic_patternfly import DropdownItemNotFound
 
-from cfme import test_requirements
 from cfme.fixtures.provider import setup_or_skip
 from cfme.infrastructure.provider import InfraProvider
-from cfme.infrastructure.provider.virtualcenter import VMwareProvider
 from cfme.infrastructure.virtual_machines import InfraVmCollection
+from cfme.markers.env_markers.provider import ONE
 from cfme.markers.env_markers.provider import ONE_PER_TYPE
-from cfme.markers.env_markers.provider import providers
 from cfme.utils.blockers import BZ
-from cfme.utils.log import logger
-from cfme.utils.providers import ProviderFilter
 
 pytestmark = [
     pytest.mark.tier(3),
@@ -20,20 +14,6 @@
                          selector=ONE_PER_TYPE),
 ]
 
-'''
-@pytest.fixture
-def create_vm(appliance, provider, request):
-    """Fixture to provision vm to the provider being tested"""
-    vm_name = fauxfactory.gen_alphanumeric(15, start="test_clone_")
-    vm = appliance.collections.infra_vms.instantiate(vm_name, provider)
-    logger.info("provider_key: %s", provider.key)
-
-    if not provider.mgmt.does_vm_exist(vm.name):
-        logger.info("deploying %s on provider %s", vm.name, provider.key)
-        vm.create_on_provider(allow_skip="default", find_in_cfme=True)
-    yield vm
-    vm.cleanup_on_provider()
-'''
 
 @pytest.fixture
 def setup_provider_min_vms(request, appliance, provider, min_vms):
@@ -44,28 +24,23 @@ def setup_provider_min_vms(request, appliance, provider, min_vms):
     setup_or_skip(request, provider)
 
 
-#@pytest.mark.provider([InfraProvider], selector=ONE, scope="function")
+@pytest.mark.provider([InfraProvider], selector=ONE, scope="function")
 @pytest.mark.parametrize("min_vms", [2, 4])
 @pytest.mark.parametrize("vm_collection", ["provider", "appliance"])
 @pytest.mark.meta(blockers=[BZ(1784180, forced_streams=["5.10"])], automates=[1784180])
-def test_compare_vms(appliance, setup_provider_min_vms, provider,
-                                    min_vms, vm_collection):
+def test_compare_vms(appliance, setup_provider_min_vms, provider, min_vms, vm_collection):
     """
     Polarion:
-        assignee: prichard
+        assignee: prichard  ????????
         casecomponent: Infra
         caseimportance: high
         initialEstimate: 1/6h
-    Bugzilla:
-        1746449
     """
     if vm_collection == 'provider':
-        provider.collections.vms = InfraVmCollection(provider,
-                                                                 filters={'provider': provider})
+        provider.collections.vms = InfraVmCollection(provider, filters={'provider': provider})
         t_coll = provider.collections.vms.all()[:min_vms]
         provider.collections.vms.compare_entities_col(provider, entities_list=t_coll)
     elif vm_collection == 'appliance':
-        # This is named a provider test, but I wanted to test with appliance.
         appliance.collections.vms = InfraVmCollection(appliance)
         t_coll = appliance.collections.templates.all()[:min_vms]
         appliance.collections.vms.compare_entities_col(provider, entities_list=t_coll)