Revision: 2521
Author: pekka.klarck
Date: Tue Feb 23 07:24:21 2010
Log: consistent timeout formatting with Wait Until Kw Succeeds
http://code.google.com/p/robotframework/source/detail?r=2521
Modified:
/trunk/src/robot/running/timeouts.py
=======================================
--- /trunk/src/robot/running/timeouts.py Tue Feb 23 04:15:13 2010
+++ /trunk/src/robot/running/timeouts.py Tue Feb 23 07:24:21 2010
@@ -39,7 +39,7 @@
return self._defaults
secs = utils.timestr_to_secs(params[0])
msg = len(params) > 1 and ' '.join(params[1:]) or None
- return utils.secs_to_timestr(secs, True), secs, msg
+ return utils.secs_to_timestr(secs), secs, msg
def start(self):
self.starttime = time.time()
@@ -99,7 +99,7 @@
def get_message(self):
if self.message is not None:
return self.message
- return '%s timeout %s exceeded' % (self.type.capitalize(),
self.string)
+ return '%s timeout %s exceeded.' % (self.type.capitalize(),
self.string)
class TestTimeout(_Timeout):
