Make tests compatible with RF 4 and 5

pekkaklarck · pekkaklarck · commit ea81959879bf · 2020-09-14T13:56:25.000+03:00
diff --git a/atest/robot/cli/rebot/help_and_version.robot b/atest/robot/cli/rebot/help_and_version.robot
@@ -25,5 +25,5 @@ Version
     Should Be Equal        ${result.rc}    ${251}
     Should Be Empty        ${result.stderr}
     Should Match Regexp    ${result.stdout}
-    ...    ^Rebot 3\\.\\d(\\.\\d)?((a|b|rc)\\d)?(\\.dev\\d)? \\((Python|Jython|IronPython|PyPy) [23]\\.[\\d.]+.* on .+\\)$
+    ...    ^Rebot [345]\\.\\d(\\.\\d)?((a|b|rc)\\d)?(\\.dev\\d)? \\((Python|Jython|IronPython|PyPy) [23]\\.[\\d.]+.* on .+\\)$
     Should Be True         len($result.stdout) < 80    Too long version line
diff --git a/atest/robot/cli/runner/help_and_version.robot b/atest/robot/cli/runner/help_and_version.robot
@@ -31,5 +31,5 @@ Version
     Should Be Equal        ${result.rc}    ${251}
     Should Be Empty        ${result.stderr}
     Should Match Regexp    ${result.stdout}
-    ...    ^Robot Framework 3\\.\\d(\\.\\d)?((a|b|rc)\\d)?(\\.dev\\d)? \\((Python|Jython|IronPython|PyPy) [23]\\.[\\d.]+.* on .+\\)$
+    ...    ^Robot Framework [345]\\.\\d(\\.\\d)?((a|b|rc)\\d)?(\\.dev\\d)? \\((Python|Jython|IronPython|PyPy) [23]\\.[\\d.]+.* on .+\\)$
     Should Be True         len($result.stdout) < 80    Too long version line
diff --git a/atest/robot/libdoc/python_library.robot b/atest/robot/libdoc/python_library.robot
@@ -13,7 +13,7 @@ Documentation
     ...    ``Telnet`` is Robot Framework's standard library that makes it possible to
 
 Version
-    Version Should Match             3.*
+    Version Should Match             [345].*
 
 Type
     Type Should Be                   LIBRARY
diff --git a/atest/testdata/standard_libraries/builtin/evaluate.robot b/atest/testdata/standard_libraries/builtin/evaluate.robot
@@ -36,7 +36,7 @@ Modules are imported automatically
     Should Be Equal    ${sep}    ${/}
     Should Be Equal    ${+}    \\+
     ${version} =    Evaluate    robot.__version__.split('.')[0]
-    Should Be Equal    ${version}    3
+    Should Be True    ${version} in (3, 4, 5)
 
 Importing non-existing module fails with NameError
     [Documentation]    FAIL
diff --git a/atest/testdata/standard_libraries/builtin/should_be_true.robot b/atest/testdata/standard_libraries/builtin/should_be_true.robot
@@ -37,7 +37,7 @@ Should Not Be True with invalid expression
 Should (Not) Be True automatically imports modules
     Should Be True    os.pathsep == '${:}'
     Should Be True    math.pi > 3.14
-    Should Be True    robot.__version__[0] == '3'
+    Should Be True    robot.__version__[0] in ('3', '4', '5')
     Should Not Be True    os.sep == 'os.sep'
     Should Not Be True    sys.platform == 'hurd'    # let's see when this starts failing
 
diff --git a/atest/testdata/variables/python_evaluation.robot b/atest/testdata/variables/python_evaluation.robot
@@ -54,9 +54,10 @@ Inline variables
 
 Automatic module import
     ${{os.sep}}                                 ${/}
-    ${{robot.__version__.split('.')[0]}}        3
     ${{round(math.pi, 2)}}                      ${3.14}
     ${{json.dumps([1, None, 'kolme'])}}         [1, null, "kolme"]
+    ${{robot.__version__.split('.')[0] in ('3', '4', '5')}}
+    ...                                         ${True}
 
 Module imports are case-sensitive
     [Documentation]    FAIL
