From: Jozef Behran <jbehran@cisco.com>
Date: Fri, 13 Nov 2015 15:52:51 +0000 (+0100)
Subject: Fixed confusing ordering of comparison keyword arguments
X-Git-Tag: release/lithium-sr3~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=94112cae9ad32a13aaab2152090e50986e965bd3;hp=3971c396d85c8085a1765e7dc5cfbafb9e9cc776;p=integration%2Ftest.git

Fixed confusing ordering of comparison keyword arguments

The correct order is "expected" and then "actual" but these
arguments were stated as "actual", then "expected". As a
result when they fail, the failure report is confusingly
reverted, showing how the actual shall turn to expected.
The expected form of report is how the "expected" differs
from the "actual".

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

diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot
index cc96256647..800db68d9d 100644
--- a/csit/suites/netconf/MDSAL/northbound.robot
+++ b/csit/suites/netconf/MDSAL/northbound.robot
@@ -130,7 +130,7 @@ Get_Config_Running_To_Confirm_Delete_After_Commit
 Restconf_Get_Modules_Shall_Return_404
     [Documentation]    Check that "Not Found" is returned when Restconf is asked for the deleted element.
     ${response}=    RequestsLibrary.Get    config    config:modules    ${ACCEPT_XML}
-    BuiltIn.Should_Be_Equal_As_Strings    ${response.status_code}    404
+    BuiltIn.Should_Be_Equal_As_Strings    404    ${response.status_code}
 
 Commit_No_Transaction
     [Documentation]    Attempt to perform "commit" when there are no changes in the candidate configuration and check that it fails with the correct error.
@@ -413,13 +413,13 @@ Perform_Test
     ${actual}=    Load_And_Send_Message    ${name}
     ${expected}=    Load_Expected_Reply    ${name}
     ${newline}=    BuiltIn.Evaluate    "\\r\\n"
-    BuiltIn.Should_Be_Equal    ${actual}    ${newline}${expected}${ODL_NETCONF_PROMPT}
+    BuiltIn.Should_Be_Equal    ${newline}${expected}${ODL_NETCONF_PROMPT}    ${actual}
     [Return]    ${actual}
 
 Send_And_Check
     [Arguments]    ${name}    ${expected}
     ${actual}=    Load_And_Send_Message    ${name}
-    BuiltIn.Should_Be_Equal    ${actual}    ${expected}
+    BuiltIn.Should_Be_Equal    ${expected}    ${actual}
 
 Test_Commit_With_No_Transactions
     [Documentation]    Issue a "commit" RPC request and check that it fails with "No current transactions" error.