[robotframework] r3683 committed - fixed timeout message

[robotframework]

Revision: 3683
Author: jussi.ao.malinen
Date: Mon May 31 02:51:11 2010
Log: fixed timeout message
http://code.google.com/p/robotframework/source/detail?r=3683
Modified:
 /trunk/src/robot/running/timeouts.py

=======================================
--- /trunk/src/robot/running/timeouts.py        Mon May 31 02:31:58 2010
+++ /trunk/src/robot/running/timeouts.py        Mon May 31 02:51:11 2010
@@ -96,11 +96,11 @@
         if not self.timed_out():
             return '%s %s active. %s seconds left.' % (self.type,  
self.string,
                                                        self.time_left())
-        if self.message:
-            return self.message
         return self._get_timeout_error()

     def _get_timeout_error(self):
+        if self.message:
+            return self.message
         return '%s %s exceeded.' % (self.type, self.string)