[1LP][RFR] Fix test

cfme/tests/infrastructure/test_provisioning_rest.py

@@ -7,8 +7,6 @@
 from cfme.infrastructure.provider.virtualcenter import VMwareProvider
 from cfme.utils.rest import assert_response
 from cfme.utils.rest import query_resource_attributes
-from cfme.utils.version import LOWEST
-from cfme.utils.version import VersionPicker
 from cfme.utils.wait import wait_for
 
 
@@ -196,10 +194,14 @@ def test_provision_emails(request, provision_data, provider, appliance, smtp_tes
         initialEstimate: 1/4h
     """
     def check_one_approval_mail_received():
-        return len(smtp_test.get_emails(subject_like=VersionPicker({
-            LOWEST: "%%Your Virtual Machine configuration was Approved%%",
-            "5.10": "%%Your Virtual Machine Request was Approved%%"
-        }).pick())) == 1
+        return (
+            len(
+                smtp_test.get_emails(
+                    subject_like="%%Your Virtual Machine Request was Approved%%"
+                )
+            )
+            == 1
+        )
 
     def check_one_completed_mail_received():
         return len(smtp_test.get_emails(
@@ -208,8 +210,9 @@ def check_one_completed_mail_received():
     request.addfinalizer(lambda: clean_vm(appliance, provider, vm_name))
 
     vm_name = provision_data["vm_fields"]["vm_name"]
-    memory = int(provision_data["vm_fields"]["vm_memory"])
-    provision_data["vm_fields"]["vm_memory"] = str(memory / 2)
+    if not provider.one_of(RHEVMProvider):
+        memory = int(provision_data["vm_fields"]["vm_memory"])
+        provision_data["vm_fields"]["vm_memory"] = str(memory / 2)
     provision_data["vm_fields"]["number_of_cpus"] += 1
 
     appliance.rest_api.collections.provision_requests.action.create(**provision_data)

cfme/tests/intelligence/reports/test_reports.py

@@ -10,7 +10,6 @@
 from cfme.rest.gen_data import users as _users
 from cfme.rest.gen_data import vm as _vm
 from cfme.utils.appliance.implementations.ui import navigate_to
-from cfme.utils.blockers import BZ
 from cfme.utils.conf import cfme_data
 from cfme.utils.ftp import FTPClientWrapper
 from cfme.utils.ftp import FTPException
@@ -512,18 +511,12 @@ def test_reports_online_vms(appliance, setup_provider, provider, request, vm):
 
 @pytest.mark.tier(1)
 @pytest.mark.ignore_stream("5.10")
-@pytest.mark.uncollectif(
-    lambda case_sensitive: not case_sensitive and BZ("1741588", forced_streams=["5.11"]).blocks,
-    reason="Case Insensitive filtering is still a WIP",
-)
-@pytest.mark.parametrize(
-    "case_sensitive", [True, False], ids=["case-sensitive", "case-insensitive"]
-)
-@pytest.mark.meta(automates=[1678150, 1741588])
-def test_reports_filter_content(case_sensitive, set_and_get_tenant_quota, tenant_report):
+@pytest.mark.meta(automates=[1678150])
+def test_reports_filter_content(set_and_get_tenant_quota, tenant_report):
     """
     Bugzilla:
         1678150
+        1741588
 
     Polarion:
         assignee: pvala
@@ -540,7 +533,7 @@ def test_reports_filter_content(case_sensitive, set_and_get_tenant_quota, tenant
             1.
             2. Content must be filtered.
     """
-    search_term = "in GB" if case_sensitive else "in gb"
+    search_term = "in GB"
     table = tenant_report.filter_report_content(field="Quota Name", search_term=search_term)
     expected = ["Allocated Memory in GB", "Allocated Storage in GB"]
     got = [row["Quota Name"].text for row in table.rows()]

cfme/tests/test_ui.py

@@ -1,7 +1,6 @@
 import pytest
 
 from cfme import test_requirements
-from cfme.fixtures.soft_assert import soft_assert
 from cfme.utils.appliance.implementations.ui import navigate_to
 
 
@@ -24,7 +23,7 @@ def traverse(dic, paths, path=None):
 
 
 @pytest.mark.meta(coverage=[1648338])
-def test_each_page(appliance):
+def test_each_page(appliance, soft_assert):
     """
     Bugzilla:
         1648338

cfme/tests/webui/test_general_ui_manual.py

@@ -58,7 +58,7 @@ def test_notification_window_can_be_closed_by_clicking_x():
     pass
 
 
-@pytest.mark.manual
+@pytest.mark.manual("manualonly")
 @pytest.mark.tier(1)
 @pytest.mark.meta(coverage=[1651194, 1503213])
 @test_requirements.general_ui