Revision: 990323e71f03
Author:   Mikko Korpela <[email protected]>
Date:     Wed Jan 11 23:17:18 2012
Log:      help_and_version; Match should also work for Python 2.7.2+
http://code.google.com/p/robotframework/source/detail?r=990323e71f03

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

=======================================
--- /atest/robot/cli/rebot/help_and_version.txt Wed Dec 14 03:02:28 2011
+++ /atest/robot/cli/rebot/help_and_version.txt Wed Jan 11 23:17:18 2012
@@ -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 20\\d{6}) \\([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.]+.* on .+\\)$
     Should Be True  len("${output}") < 80  Too long version line
=======================================
--- /atest/robot/cli/runner/help_and_version.txt        Wed Dec 14 03:02:28 2011
+++ /atest/robot/cli/runner/help_and_version.txt        Wed Jan 11 23:17:18 2012
@@ -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 20\\d{6}) \\([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.]+.* on .+\\)$
     Should Be True  len("${output}") < 80  Too long version line

Reply via email to