From 696ddacffd5f5588c512ef7769ffe9d8f8dc5dc1 Mon Sep 17 00:00:00 2001
From: john-dupuy <jdupuy@redhat.com>
Date: Mon, 11 Mar 2019 10:06:03 -0400
Subject: [PATCH] Remove manual case that is automated and remove fixtured
 collection

---
 cfme/tests/control/test_basic.py           | 17 -----------------
 cfme/tests/control/test_import_policies.py | 11 +++--------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/cfme/tests/control/test_basic.py b/cfme/tests/control/test_basic.py
index 14e6d678a3..a8ac3a4c9a 100644
--- a/cfme/tests/control/test_basic.py
+++ b/cfme/tests/control/test_basic.py
@@ -733,20 +733,3 @@ def test_control_policy_simulation_displayed():
         initialEstimate: 1/6h
     """
     pass
-
-
-@pytest.mark.manual
-@test_requirements.control
-@pytest.mark.tier(3)
-def test_control_import_with_incorrect_schema():
-    """
-    Test importing yaml with incorrect schema.
-
-    Polarion:
-        assignee: jdupuy
-        casecomponent: Control
-        caseimportance: low
-        caseposneg: negative
-        initialEstimate: 1/12h
-    """
-    pass
diff --git a/cfme/tests/control/test_import_policies.py b/cfme/tests/control/test_import_policies.py
index d9978cae9c..ea4b08e299 100644
--- a/cfme/tests/control/test_import_policies.py
+++ b/cfme/tests/control/test_import_policies.py
@@ -21,11 +21,6 @@ def import_invalid_yaml_file(request):
     return data_path.join("ui/control/invalid.yaml").realpath().strpath
 
 
-@pytest.fixture(scope="module")
-def policy_profile_collection(appliance):
-    return appliance.collections.policy_profiles
-
-
 @pytest.mark.meta(blockers=[1106456, 1198111], automates=[1198111])
 def test_import_policies(appliance, import_policy_file):
     """
@@ -52,7 +47,7 @@ def test_control_import_invalid_yaml_file(appliance, import_invalid_yaml_file):
         import_export.import_file(appliance, import_invalid_yaml_file)
 
 
-def test_control_import_existing_policies(appliance, import_policy_file, policy_profile_collection):
+def test_control_import_existing_policies(appliance, import_policy_file):
     """
     Polarion:
         assignee: jdupuy
@@ -62,7 +57,7 @@ def test_control_import_existing_policies(appliance, import_policy_file, policy_
         initialEstimate: 1/12h
     """
     import_export.import_file(appliance, import_policy_file)
-    first_import = policy_profile_collection.all_policy_profile_names
+    first_import = appliance.collections.policy_profiles.all_policy_profile_names
     import_export.import_file(appliance, import_policy_file)
-    second_import = policy_profile_collection.all_policy_profile_names
+    second_import = appliance.collections.policy_profiles.all_policy_profile_names
     assert first_import == second_import