ipy test compatibility (and whitespace cleanup)

pekkaklarck · pekkaklarck · commit 2b56ffe27009 · 2019-05-13T16:59:46.000+03:00
diff --git a/atest/robot/standard_libraries/builtin/log.robot b/atest/robot/standard_libraries/builtin/log.robot
@@ -87,9 +87,10 @@ formatter=repr
 
 formatter=ascii
     ${tc} =    Check Test Case    ${TEST NAME}
-    ${u} =    Set Variable If    ${INTERPRETER.is_py2}    u    ${EMPTY}
-    ${b} =    Set Variable If    ${INTERPRETER.is_py2}    ${EMPTY}    b
-    Check Log Message    ${tc.kws[0].msgs[0]}    ${u}'Nothing special here'
+    ${u} =     Set Variable If    ${INTERPRETER.is_py2}    u    ${EMPTY}
+    ${u2} =    Set Variable If    ${INTERPRETER.is_py2} and not ${INTERPRETER.is_ironpython}    u    ${EMPTY}
+    ${b} =     Set Variable If    ${INTERPRETER.is_py2} and not ${INTERPRETER.is_ironpython}    ${EMPTY}    b
+    Check Log Message    ${tc.kws[0].msgs[0]}    ${u2}'Nothing special here'
     Check Log Message    ${tc.kws[1].msgs[0]}    ${u}'Hyv\\xe4\\xe4 y\\xf6t\\xe4 \\u2603!'
     Check Log Message    ${tc.kws[2].msgs[0]}    42    DEBUG
     Check Log Message    ${tc.kws[4].msgs[0]}    ${b}'\\x00abc\\xff (formatter=ascii)'
diff --git a/atest/testdata/standard_libraries/builtin/should_be_equal.robot b/atest/testdata/standard_libraries/builtin/should_be_equal.robot
@@ -88,15 +88,15 @@ formatter=repr/ascii with non-ASCII characters on Python 2
     ...
     ...    2) '\\xc4' != 'A'
     ...
-    ...    3) u'\\xc4' != u'A'
+    ...    3) u'\\xc4' != ${U}'A'
     ...
     ...    4) Ä (string) != Ä (string)
     ...
     ...    5) '\\xc4' != 'A\\u0308'
     ...
     ...    6) u'\\xc4' != u'A\\u0308'
     ...
-    ...    7) {'A': 2, 'a': 1, '\\xc4': 4, '\\xe4': 3} != {b'a': 1}
+    ...    7) {'A': 2, 'a': 1, '\\xc4': 4, '\\xe4': 3} != ${PREPR_DICT1}
     ...
     ...    8) ${ASCII DICT} != {'a': 1}
     Ä          A
diff --git a/atest/testdata/standard_libraries/builtin/variables_to_verify.py b/atest/testdata/standard_libraries/builtin/variables_to_verify.py
@@ -1,5 +1,6 @@
-import os
 from collections import OrderedDict
+import os
+import sys
 
 try:
     ascii
@@ -12,6 +13,9 @@
     import jarray
 
 
+PY3_OR_IPY = sys.version_info[0] > 2 or sys.platform == 'cli'
+
+
 def get_variables():
     variables = dict(
         BYTES_WITHOUT_NON_ASCII=b'hyva',
@@ -33,6 +37,8 @@ def get_variables():
         DICT_3={'a': 1, 'b': 2, 'c': 3},
     )
     variables['ASCII_DICT'] = ascii(variables['DICT'])
+    variables['PREPR_DICT1'] = "{'a': 1}" if PY3_OR_IPY else "{b'a': 1}"
+    variables['U'] = '' if PY3_OR_IPY else 'u'
     if os.name == 'java':
         variables.update(get_java_variables(**variables))
     return variables
diff --git a/atest/testdata/standard_libraries/remote/timeouts.robot b/atest/testdata/standard_libraries/remote/timeouts.robot
@@ -28,7 +28,7 @@ Test initial connection failure
     Run Keyword And Expect Error    ${error}
     ...    Import Library    Remote    1.2.3.4:666    timeout=0.2 seconds
     ${end} =    Get Current Date
-    ${elapsed} =    Subtract Date From Date    ${end}    ${start}
+    ${elapsed} =    Subtract Date From Date    ${end}    ${start}
     Should Be True    ${elapsed} < 10
 
 Test too long keyword execution time
diff --git a/utest/utils/test_asserts.py b/utest/utils/test_asserts.py
@@ -84,10 +84,10 @@ def test_assert_equal_with_values_having_same_string_repr(self):
 
     def test_assert_equal_with_custom_formatter(self):
         assert_equal(u'hyv\xe4', u'hyv\xe4', formatter=repr)
-        expected = "u'hyv\\xe4' != u'paha'" if PY2 else "'hyv\xe4' != 'paha'"
-        assert_raises_with_msg(AE, expected,
-                               assert_equal, u'hyv\xe4', u'paha',
-                               formatter=repr)
+        assert_raises_with_msg(
+            AE, "u'hyv\\xe4' != 'paha'" if PY2 else "'hyv\xe4' != 'paha'",
+            assert_equal, u'hyv\xe4', 'paha', formatter=repr
+        )
         if PY3:
             assert_raises_with_msg(AE, "'hyv\\xe4' != 'paha'",
                                    assert_equal, 'hyv\xe4', 'paha',
diff --git a/utest/utils/test_unic.py b/utest/utils/test_unic.py
@@ -143,7 +143,7 @@ def test_unicode_repr(self):
 
     def test_bytes_repr(self):
         obj = BytesRepr()
-        if PY3:
+        if PY3 or IRONPYTHON:
             expected = obj.unrepr
         else:
             expected = 'Hyv\\xe4'
