3 new revisions:
Revision: 0ad9930d3595
Author: Pekka Klärck
Date: Wed Dec 14 03:02:28 2011
Log: Fixed version tests when Python version is in format 2.x and not
2.x.y
http://code.google.com/p/robotframework/source/detail?r=0ad9930d3595
Revision: 23de31968156
Author: Pekka Klärck
Date: Wed Dec 14 03:19:10 2011
Log: smaller sleep interval to reduce test flickering
http://code.google.com/p/robotframework/source/detail?r=23de31968156
Revision: 7d378022fb6c
Author: Pekka Klärck
Date: Wed Dec 14 03:26:44 2011
Log: 1) Handle linking warnings only based on Message timestampt,
level, an...
http://code.google.com/p/robotframework/source/detail?r=7d378022fb6c
==============================================================================
Revision: 0ad9930d3595
Author: Pekka Klärck
Date: Wed Dec 14 03:02:28 2011
Log: Fixed version tests when Python version is in format 2.x and not
2.x.y
http://code.google.com/p/robotframework/source/detail?r=0ad9930d3595
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 Nov 9 07:01:35 2011
+++ /atest/robot/cli/rebot/help_and_version.txt Wed Dec 14 03:02:28 2011
@@ -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 Nov 9 07:03:33 2011
+++ /atest/robot/cli/runner/help_and_version.txt Wed Dec 14 03:02:28 2011
@@ -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
==============================================================================
Revision: 23de31968156
Author: Pekka Klärck
Date: Wed Dec 14 03:19:10 2011
Log: smaller sleep interval to reduce test flickering
http://code.google.com/p/robotframework/source/detail?r=23de31968156
Modified:
/atest/testresources/testlibs/ExampleLibrary.py
=======================================
--- /atest/testresources/testlibs/ExampleLibrary.py Sat Dec 10 12:53:04 2011
+++ /atest/testresources/testlibs/ExampleLibrary.py Wed Dec 14 03:19:10 2011
@@ -131,7 +131,7 @@
remaining = endtime - time.time()
if remaining <= 0:
break
- time.sleep(min(remaining, 0.5))
+ time.sleep(min(remaining, 0.1))
def return_custom_iterable(self, *values):
return _MyIterable(*values)
==============================================================================
Revision: 7d378022fb6c
Author: Pekka Klärck
Date: Wed Dec 14 03:26:44 2011
Log: 1) Handle linking warnings only based on Message timestampt,
level, and message. 2) Remove linkable attribute from Message because it
isn't used anymore.
http://code.google.com/p/robotframework/source/detail?r=7d378022fb6c
Modified:
/src/robot/model/message.py
/src/robot/output/logger.py
/src/robot/output/loggerhelper.py
/src/robot/output/xmllogger.py
/src/robot/reporting/jsbuildingcontext.py
/src/robot/reporting/jsmodelbuilders.py
/src/robot/result/xmlelementhandlers.py
/utest/reporting/test_jsmodelbuilders.py
=======================================
--- /src/robot/model/message.py Sun Dec 4 15:02:51 2011
+++ /src/robot/model/message.py Wed Dec 14 03:26:44 2011
@@ -18,16 +18,15 @@
class Message(ModelObject):
- __slots__ =
['message', 'level', 'html', 'timestamp', 'linkable', 'parent']
+ __slots__ = ['message', 'level', 'html', 'timestamp', 'parent']
# TODO: Use None instead of N/A with all timestamps in model
def __init__(self, message='', level='INFO', html=False,
timestamp='N/A',
- linkable=False, parent=None):
+ parent=None):
self.message = message
self.level = level
self.html = html
self.timestamp = timestamp
- self.linkable = linkable
self.parent = parent
@property
=======================================
--- /src/robot/output/logger.py Fri Sep 23 03:50:38 2011
+++ /src/robot/output/logger.py Wed Dec 14 03:26:44 2011
@@ -102,7 +102,6 @@
for logger in self._loggers.all_loggers():
logger.log_message(msg)
if msg.level == 'WARN':
- msg.linkable = True
self.message(msg)
log_message = message
=======================================
--- /src/robot/output/loggerhelper.py Mon Nov 28 05:37:49 2011
+++ /src/robot/output/loggerhelper.py Wed Dec 14 03:26:44 2011
@@ -64,12 +64,11 @@
class Message(BaseMessage):
__slots__ = []
- def __init__(self, message, level='INFO', html=False, timestamp=None,
- linkable=False):
+ def __init__(self, message, level='INFO', html=False, timestamp=None):
message = self._normalize_message(message)
level, html = self._get_level_and_html(level, html)
timestamp = self._get_timestamp(timestamp)
- BaseMessage.__init__(self, message, level, html, timestamp,
linkable)
+ BaseMessage.__init__(self, message, level, html, timestamp)
def _normalize_message(self, msg):
if not isinstance(msg, basestring):
=======================================
--- /src/robot/output/xmllogger.py Tue Dec 13 14:38:26 2011
+++ /src/robot/output/xmllogger.py Wed Dec 14 03:26:44 2011
@@ -60,8 +60,6 @@
attrs = {'timestamp': msg.timestamp, 'level': msg.level}
if msg.html:
attrs['html'] = 'yes'
- if msg.linkable:
- attrs['linkable'] = 'yes'
self._writer.element('msg', msg.message, attrs)
def start_keyword(self, kw):
=======================================
--- /src/robot/reporting/jsbuildingcontext.py Wed Dec 7 12:40:22 2011
+++ /src/robot/reporting/jsbuildingcontext.py Wed Dec 14 03:26:44 2011
@@ -60,7 +60,7 @@
return (msg.message, msg.level, msg.timestamp)
def link(self, msg):
- return self._msg_links[self._link_key(msg)]
+ return self._msg_links.get(self._link_key(msg))
@property
def strings(self):
=======================================
--- /src/robot/reporting/jsmodelbuilders.py Thu Dec 8 01:37:15 2011
+++ /src/robot/reporting/jsmodelbuilders.py Wed Dec 14 03:26:44 2011
@@ -173,4 +173,5 @@
def build(self, msg):
model = self._build(msg)
- return model if not msg.linkable else model +
(self._context.link(msg),)
+ link = self._context.link(msg)
+ return model if not link else model + (link,)
=======================================
--- /src/robot/result/xmlelementhandlers.py Thu Dec 1 14:32:10 2011
+++ /src/robot/result/xmlelementhandlers.py Wed Dec 14 03:26:44 2011
@@ -123,8 +123,7 @@
result.messages.create(elem.text or '',
elem.get('level'),
elem.get('html', 'no') == 'yes',
- elem.get('timestamp'),
- elem.get('linkable', 'no') == 'yes')
+ elem.get('timestamp'))
class _StatusHandler(_Handler):
=======================================
--- /utest/reporting/test_jsmodelbuilders.py Mon Dec 12 05:53:30 2011
+++ /utest/reporting/test_jsmodelbuilders.py Wed Dec 14 03:26:44 2011
@@ -343,7 +343,7 @@
assert_equals(model, ((0, 5, 'Error'), (42, 3, 'Warning')))
def test_linking(self):
- self.errors.messages.create('Linkable', 'WARN', linkable=True,
+ self.errors.messages.create('Linkable', 'WARN',
timestamp='20111206 14:33:00.001')
context = JsBuildingContext()
kw = TestSuite().tests.create().keywords.create()
