Move the timeout tests in mdsal.robot to their proper place

The timeout tests are conceptually "failed requests tests"
so they don't belong to a test case whose name says "invoke
restperfclient" when there is another whose name says "check
for request failures". Move these checks to the proper test
case.

Change-Id: I7ab625df6c29fd6fb91b7174715476ed77eda07f
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/csit/suites/netconf/restperfclient/mdsal.robot b/csit/suites/netconf/restperfclient/mdsal.robot
index 795e6e7c8e75654dbe23ec644e7863423f9b6d3f..ae7923b1bb6dc7214302d23d91422aee5e62adaa 100644 (file)
--- a/csit/suites/netconf/restperfclient/mdsal.robot
+++ b/csit/suites/netconf/restperfclient/mdsal.robot
@@ -60,8 +60,6 @@ Run_RestPerfClient_Directly_On_MDSAL
     Set_Known_Bug_Id    5413
     Execute_Command_Passes    ${command} >${restperfclientlog} 2>&1
     Set_Unknown_Bug_Id
-    ${result}=    SSHLibrary.Execute_Command    grep "thread timed out" ${restperfclientlog}
-    BuiltIn.Should_Be_Equal    '${result}'    ''
     ${result}=    SSHLibrary.Execute_Command    grep "FINISHED. Execution time:" ${restperfclientlog}
     BuiltIn.Should_Not_Be_Equal    '${result}'    ''
 
@@ -71,6 +69,8 @@ Check_For_Failed_Direct_MDSAL_Requests
     ...    failure and failed requests. Failed requests are rejected because
     ...    we don't want to test performance of ODL rejecting our requests.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
+    ${result}=    SSHLibrary.Execute_Command    grep "thread timed out" ${restperfclientlog}
+    BuiltIn.Should_Be_Equal    '${result}'    ''
     ${result}=    SSHLibrary.Execute_Command    grep "Request failed" ${restperfclientlog}
     BuiltIn.Should_Be_Equal    '${result}'    ''
     ${result}=    SSHLibrary.Execute_Command    grep "Status code" ${restperfclientlog}
@@ -103,9 +103,6 @@ Run_RestPerfClient_Through_Netconf_Connector
     BuiltIn.Log    Running restperfclient: ${command}
     Set_Known_Bug_Id    5413
     Execute_Command_Passes    ${command} >${restperfclientlog} 2>&1
-    Set_Known_Bug_Id    5581
-    ${result}=    SSHLibrary.Execute_Command    grep "thread timed out" ${restperfclientlog}
-    BuiltIn.Should_Be_Equal    '${result}'    ''
     Set_Unknown_Bug_Id
     ${result}=    SSHLibrary.Execute_Command    grep "FINISHED. Execution time:" ${restperfclientlog}
     BuiltIn.Should_Not_Be_Equal    '${result}'    ''
@@ -116,6 +113,10 @@ Check_For_Failed_Netconf_Connector_Requests
     ...    failure and failed requests. Failed requests are rejected because
     ...    we don't want to test performance of ODL rejecting our requests.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
+    Set_Known_Bug_Id    5581
+    ${result}=    SSHLibrary.Execute_Command    grep "thread timed out" ${restperfclientlog}
+    BuiltIn.Should_Be_Equal    '${result}'    ''
+    Set_Unknown_Bug_Id
     ${result}=    SSHLibrary.Execute_Command    grep "Request failed" ${restperfclientlog}
     BuiltIn.Should_Be_Equal    '${result}'    ''
     ${result}=    SSHLibrary.Execute_Command    grep "Status code" ${restperfclientlog}