2 new revisions:
Revision: 3971ee27bff2
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 04:01:51 2013
Log: fix timeout in report when log none
http://code.google.com/p/robotframework/source/detail?r=3971ee27bff2
Revision: f4d775a2e300
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 04:01:55 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=f4d775a2e300
==============================================================================
Revision: 3971ee27bff2
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 04:01:51 2013
Log: fix timeout in report when log none
http://code.google.com/p/robotframework/source/detail?r=3971ee27bff2
Modified:
/src/robot/output/xmllogger.py
/src/robot/reporting/jsbuildingcontext.py
/src/robot/running/timeouts/__init__.py
=======================================
--- /src/robot/output/xmllogger.py Thu May 23 05:52:43 2013
+++ /src/robot/output/xmllogger.py Thu May 30 04:01:51 2013
@@ -67,7 +67,7 @@
def start_keyword(self, kw):
attrs = {'name': kw.name, 'type': kw.type}
if kw.timeout:
- attrs['timeout'] = str(kw.timeout)
+ attrs['timeout'] = unicode(kw.timeout)
self._writer.start('kw', attrs)
self._writer.element('doc', kw.doc)
self._write_list('arguments', 'arg', (unic(a) for a in kw.args))
@@ -79,7 +79,7 @@
def start_test(self, test):
attrs = {'id': test.id, 'name': test.name}
if test.timeout:
- attrs['timeout'] = str(test.timeout)
+ attrs['timeout'] = unicode(test.timeout)
self._writer.start('test', attrs)
def end_test(self, test):
=======================================
--- /src/robot/reporting/jsbuildingcontext.py Fri Aug 10 07:49:15 2012
+++ /src/robot/reporting/jsbuildingcontext.py Thu May 30 04:01:51 2013
@@ -38,6 +38,8 @@
def string(self, string, escape=True):
if escape and string: # string can, but should not, be None
+ if not isinstance(string, unicode):
+ string = unicode(string)
string = html_escape(string)
return self._strings.add(string)
=======================================
--- /src/robot/running/timeouts/__init__.py Wed May 29 12:47:49 2013
+++ /src/robot/running/timeouts/__init__.py Thu May 30 04:01:51 2013
@@ -76,6 +76,9 @@
return self.active and self.time_left() <= 0
def __str__(self):
+ return unicode(self).encode('utf-8')
+
+ def __unicode__(self):
return self.string
def __cmp__(self, other):
==============================================================================
Revision: f4d775a2e300
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 04:01:55 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=f4d775a2e300
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
