2 new revisions:
Revision: a482b4a0ef03
Author: Janne Härkönen <[email protected]>
Date: Thu Jan 12 04:38:26 2012
Log: package.py: consistent name for jar distribution
http://code.google.com/p/robotframework/source/detail?r=a482b4a0ef03
Revision: 891965a89935
Author: Janne Härkönen <[email protected]>
Date: Thu Jan 12 04:38:48 2012
Log: Fix tests depending on version format
http://code.google.com/p/robotframework/source/detail?r=891965a89935
==============================================================================
Revision: a482b4a0ef03
Author: Janne Härkönen <[email protected]>
Date: Thu Jan 12 04:38:26 2012
Log: package.py: consistent name for jar distribution
http://code.google.com/p/robotframework/source/detail?r=a482b4a0ef03
Modified:
/package.py
=======================================
--- /package.py Thu Jan 12 04:08:12 2012
+++ /package.py Thu Jan 12 04:38:26 2012
@@ -117,7 +117,7 @@
_update_version(version_number, _verify_version(release_tag,
RELEASES))
sys.path.insert(0, ROBOT_PATH)
from version import get_version
- return get_version(sep='-')
+ return get_version(sep='')
def _verify_version(given, valid):
for item in valid:
@@ -130,6 +130,7 @@
vfile = open(VERSION_PATH, 'wb')
vfile.write(VERSION_CONTENT % locals())
vfile.close()
+ # TODO: Fix before next final release
#_update_pom_version(version_number, release_tag)
print 'Updated version to %s %s' % (version_number, release_tag)
==============================================================================
Revision: 891965a89935
Author: Janne Härkönen <[email protected]>
Date: Thu Jan 12 04:38:48 2012
Log: Fix tests depending on version format
http://code.google.com/p/robotframework/source/detail?r=891965a89935
Modified:
/atest/robot/cli/rebot/help_and_version.txt
/atest/robot/cli/runner/help_and_version.txt
/atest/robot/output/listener_interface/listener_logging.txt
=======================================
--- /atest/robot/cli/rebot/help_and_version.txt Wed Jan 11 23:17:18 2012
+++ /atest/robot/cli/rebot/help_and_version.txt Thu Jan 12 04:38:48 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+)?( (a|b|
c)\\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 Jan 11 23:17:18 2012
+++ /atest/robot/cli/runner/help_and_version.txt Thu Jan 12 04:38:48 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+)?(
(a|b|c)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+.* on .+\\)$
Should Be True len("${output}") < 80 Too long version line
=======================================
--- /atest/robot/output/listener_interface/listener_logging.txt Fri Sep 23
01:44:35 2011
+++ /atest/robot/output/listener_interface/listener_logging.txt Thu Jan 12
04:38:48 2012
@@ -114,7 +114,7 @@
Check Log Message ${kw.msgs[10]} end_keyword WARN
Correct messages should be logged to syslog
- :FOR ${msg} IN message: INFO Robot Framework trunk start_suite
+ :FOR ${msg} IN message: INFO Robot Framework start_suite
... end_suite start_test end_test output_file log_file
report_file
\ Check syslog contains | INFO \ | ${msg}
\ Check syslog contains | WARN \ | ${msg}
