resolve conflicts

Signed-off-by: bdattoma <bdattoma@redhat.com>
red-hat-data-services · Oct 7, 2022 · c8a99a8 · c8a99a8
1 parent 7e8095e
commit c8a99a8
Showing 1 changed file with 12 additions and 25 deletions.
diff --git a/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot b/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot
@@ -83,6 +83,7 @@ Verify Content In RHODS Explore Section
 Verify Disabled Cards Can Be Removed
     [Documentation]     Verifies it is possible to remove a disabled card from Enabled page.
     ...                 It uses RHOSAK as example to test the feature
+    ...                 ProductBug: RHODS-2902
     [Tags]    Sanity
     ...       ODS-1081    ODS-1092
     ...       ProductBug
@@ -239,6 +240,7 @@ Verify Notifications Are Shown When Notebook Builds Have Not Started
 
 Verify "Enabled" Keeps Being Available After One Of The ISV Operators If Uninstalled
    [Documentation]     Verify "Enabled" keeps being available after one of the ISV operators if uninstalled
+   ...                 ProductBug: RHODS-3985
    [Tags]      Sanity
    ...         ODS-1491
    ...         Tier1
@@ -249,13 +251,14 @@ Verify "Enabled" Keeps Being Available After One Of The ISV Operators If Uninsta
    [Teardown]    Check And Uninstall Operator In Openshift    ${openvino_operator_name}   ${openvino_appname}    ${openvino_dashboard_app_id}
 
 Verify Error Message In Logs When A RHODS Group Is Empty
+    [Documentation]     Verifies the messages printed out in the logs of
+    ...                 dashboard pods are the ones expected when an empty group
+    ...                 is set as admin in OdhDashboardConfig CRD
+    ...                 ProductBug: RHODS-5420
     [Tags]  Sanity
     ...     Tier1
     ...     ODS-1408
     ...     ProductBug
-    [Documentation]     Verifies the messages printed out in the logs of
-    ...                 dashboard pods are the ones expected when an empty group
-    ...                 is set as admin in OdhDashboardConfig CRD
     [Setup]     Set Variables For Group Testing
     Create Group    group_name=${CUSTOM_EMPTY_GROUP}
     ${lengths_dict_before}=     Get Lengths Of Dashboard Pods Logs
@@ -267,13 +270,14 @@ Verify Error Message In Logs When A RHODS Group Is Empty
     [Teardown]      Set Default Groups And Check Logs Do Not Change     delete_group=${TRUE}
 
 Verify Error Message In Logs When A RHODS Group Does Not Exist
-    [Tags]  Sanity
-    ...     Tier1
-    ...     ODS-1494
-    ...     AutomationBug
     [Documentation]     Verifies the messages printed out in the logs of
     ...                 dashboard pods are the ones expected when an inexistent group
     ...                 is set as admin in OdhDashboardConfig CRD
+    ...                 ProductBug:  RHODS-5088
+    [Tags]  Sanity
+    ...     Tier1
+    ...     ODS-1494
+    ...     ProductBug
     [Setup]     Set Variables For Group Testing
     ${lengths_dict_before}=     Get Lengths Of Dashboard Pods Logs
     Set RHODS Admins Group To Inexistent Group
@@ -289,6 +293,7 @@ Verify Error Message In Logs When All Authenticated Users Are Set As RHODS Admin
     [Documentation]     Verifies the messages printed out in the logs of
     ...                 dashboard pods are the ones expected when 'system:authenticated'
     ...                 is set as admin in OdhDashboardConfig CRD
+    ...                 ProductBug:  RHODS-5088
     [Tags]    Sanity
     ...       Tier1
     ...       ODS-1500
@@ -301,23 +306,6 @@ Verify Error Message In Logs When All Authenticated Users Are Set As RHODS Admin
     ...     prev_logs_lengths=${lengths_dict_before}
     [Teardown]      Set Default Groups And Check Logs Do Not Change
 
-Verify Error Message In Logs When rhods-groups-config ConfigMap Does Not Exist
-    [Documentation]     Verifies the messages printed out in the logs of
-    ...                 dashboard pods are the ones expected when "rhods-groups-config"
-    ...                 ConfigMap does not exist
-    [Tags]    Sanity
-    ...       Tier1
-    ...       ODS-1495
-    ...       AutomationBug
-    [Setup]     Set Variables For Group Testing
-    ${groups_configmaps_dict}=     Get ConfigMaps For RHODS Groups Configuration
-    ${lengths_dict_before}=     Get Lengths Of Dashboard Pods Logs
-    Delete RHODS Config Map     name=${RHODS_GROUPS_CONFIG_CM}
-    ${lengths_dict_after}=      New Lines In Logs Of Dashboard Pods Should Contain
-    ...     exp_msg=${EXP_ERROR_MISSING_RGC}
-    ...     prev_logs_lengths=${lengths_dict_before}
-    [Teardown]      Restore Group ConfigMaps And Check Logs Do Not Change     cm_yamls=${groups_configmaps_dict}
-
 Verify Dashboard Pod Is Not Getting Restarted
     [Documentation]    Verify Dashboard Pod container doesn't restarted
     [Tags]    Sanity
@@ -782,4 +770,3 @@ Documentation Links Should Be Equal To The Expected Ones
     [Documentation]   Compare the fetched links from Dashboard with the expected ones
     [Arguments]     ${actual_links}     ${expected_links}
     Lists Should Be Equal   ${actual_links}    ${expected_links}    ignore_order=True
-