Revision: 4073
Author: pekka.klarck
Date: Sun Sep 19 00:44:32 2010
Log: fixed version tests to work also with [pj]ython (alpha|beta|rc)
http://code.google.com/p/robotframework/source/detail?r=4073

Modified:
 /trunk/atest/robot/cli/rebot/help_and_version.txt
 /trunk/atest/robot/cli/runner/help_and_version.txt

=======================================
--- /trunk/atest/robot/cli/rebot/help_and_version.txt Thu Aug 26 03:04:45 2010 +++ /trunk/atest/robot/cli/rebot/help_and_version.txt Sun Sep 19 00:44:32 2010
@@ -25,5 +25,5 @@
${rc} ${output} = Run And Return Rc And Output ${REBOT} --version 2>&1
     Should Be Equal  ${rc}  ${251}
     Log  ${output}
- Should Match Regexp ${output} ^Rebot (2\\.\\d+(\\.\\d+)?( (alpha| beta|rc)\\d*)?|trunk 2\\d{7}) \\([PJ]ython 2\\.[\\d.]+ on .+\\)$ + Should Match Regexp ${output} ^Rebot (2\\.\\d+(\\.\\d+)?( (alpha| beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+((a|b|rc)\\d)? on .+\\)$
     Should Be True  len("${output}") < 80  Too long version line
=======================================
--- /trunk/atest/robot/cli/runner/help_and_version.txt Thu Apr 8 08:11:28 2010 +++ /trunk/atest/robot/cli/runner/help_and_version.txt Sun Sep 19 00:44:32 2010
@@ -29,5 +29,5 @@
     ${rc}  ${output} =  Run And Return Rc And Output  ${ROBOT} --version
     Should Be Equal  ${rc}  ${251}
     Log  ${output}
- Should Match Regexp ${output} ^Robot Framework (2\\.\\d+(\\.\\d+)?( (alpha|beta|rc)\\d*)?|trunk 2\\d{7}) \\([PJ]ython 2\\.[\\d.]+ on .+\\)$ + Should Match Regexp ${output} ^Robot Framework (2\\.\\d+(\\.\\d+)?( (alpha|beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+((a|b| rc)\\d)? on .+\\)$
     Should Be True  len("${output}") < 80  Too long version line

Reply via email to