Merge pull request #73 from JFoederer/master

Update test suite to match latest Robot and Python versions

Author: pekkaklarck

test/atest/argument_spec_invalid.robot

@@ -29,15 +29,15 @@ Too few arguments when using varargs
     Required Defaults And Varargs
 
 Using arguments when only kwargs accepted
-    [Documentation]  FAIL Keyword 'Remote.Kwargs' expected 0 non-keyword arguments, got 4.
+    [Documentation]  FAIL Keyword 'Remote.Kwargs' expected 0 non-named arguments, got 4.
     Kwargs    normal    args    are    no-no
 
 Too few arguments when kwargs accepted
-    [Documentation]  FAIL Keyword 'Remote.Args And Kwargs' expected 1 to 2 non-keyword arguments, got 0.
+    [Documentation]  FAIL Keyword 'Remote.Args And Kwargs' expected 1 to 2 non-named arguments, got 0.
     Args and kwargs
 
 Too many arguments when kwargs accepted
-    [Documentation]  FAIL Keyword 'Remote.Args And Kwargs' expected 1 to 2 non-keyword arguments, got 7.
+    [Documentation]  FAIL Keyword 'Remote.Args And Kwargs' expected 1 to 2 non-named arguments, got 7.
     Args and kwargs    we    do    not    accept    this    many    args
 
 Missing argument when using kwargs

test/atest/argument_types.robot

@@ -57,7 +57,7 @@ List-like
     ()    []
     ('Hei', u'\\xe4iti', 63, (), None)    ['Hei', u'\\xe4iti', 63, [], '']
     set(['hello'])    ['hello']
-    xrange(5)    [0, 1, 2, 3, 4]
+    range(5)    [0, 1, 2, 3, 4]
 
 Dictionary
     {}

test/atest/basic_communication.robot

@@ -32,9 +32,10 @@ Use multiple times
     ...    LOG 1.1.2 Round 1
     ...    LOG 1.2.2 Round 2
     ...    LOG 1.${COUNT}.2 Round ${COUNT}
-    : FOR    ${i}    IN RANGE    ${COUNT}
-    \    Passing
-    \    Logging    Round ${i + 1}
+    FOR    ${i}    IN RANGE    ${COUNT}
+        Passing
+        Logging    Round ${i + 1}
+    END
 
 Private methods should ne ignored
     [Documentation]    FAIL No keyword with name 'Private Method' found.

test/atest/kwargs.robot

@@ -61,4 +61,4 @@ Non-string kwargs
 Binary kwargs
     ${tuple} =    Evaluate    ('\x02',)
     ${result} =    Kwargs    a=\x00    b=\x01    c=${tuple}
-    Should Match    ${result}    a:\x00, b:\x01, c:[*'\\x02'] (list)
+    Should be equal    ${result}    a:\x00, b:\x01, c:[b'\\x02'] (list)

test/atest/logging.robot

@@ -38,7 +38,7 @@ Multiple messages with different levels
     [Documentation]
     ...    LOG 1:1 INFO Info message
     ...    LOG 1:2 DEBUG Debug message
-    ...    LOG 1:3 INFO Second info\n this time with two lines
+    ...    LOG 1:3 INFO Second info\nthis time with two lines
     ...    LOG 1:4 INFO Third info
     ...    LOG 1:5 WARN Warning
     Multiple Messages With Different Levels

test/atest/module.robot

@@ -32,9 +32,10 @@ Use multiple times
     ...    LOG 1.1.2 Round 1
     ...    LOG 1.2.2 Round 2
     ...    LOG 1.${COUNT}.2 Round ${COUNT}
-    : FOR    ${i}    IN RANGE    ${COUNT}
-    \    Passing
-    \    Logging    Round ${i + 1}
+    FOR    ${i}    IN RANGE    ${COUNT}
+        Passing
+        Logging    Round ${i + 1}
+    END
 
 Private methods should ne ignored
     [Documentation]    FAIL No keyword with name 'Private Method' found.

test/atest/returning.robot

@@ -96,7 +96,7 @@ Dictionary with binary keys is not supported
     {u'\\x00': 'value'}
 
 Dictionary with binary values
-    {'0': u'\\x00', '1': b'\\x01'}
+    {'0': u'\\x00', '1': b'\\xff'}
 
 Dictionary with non-string keys and values
     [Documentation]    XML-RPC supports only strings as keys so must convert them