Revision: 2593
Author: janne.t.harkonen
Date: Thu Mar 4 00:02:02 2010
Log: Change order to fix unit tests
http://code.google.com/p/robotframework/source/detail?r=2593
Modified:
/trunk/src/robot/running/timeouts.py
=======================================
--- /trunk/src/robot/running/timeouts.py Fri Feb 26 03:17:07 2010
+++ /trunk/src/robot/running/timeouts.py Thu Mar 4 00:02:02 2010
@@ -73,11 +73,11 @@
if not self.active():
raise FrameworkError('Timeout is not active')
timeout = self.time_left()
- if timeout <= 0:
- raise TimeoutError(self.get_message())
- if logger is not None:
+ if logger:
logger.debug('%s timeout %s active. %s seconds left.'
% (self.type.capitalize(), self.string,
round(timeout, 3)))
+ if timeout <= 0:
+ raise TimeoutError(self.get_message())
notifier = Event()
runner = Runner(runnable, args, kwargs, notifier)
# Thread's name is important - it's used in utils.outputcapture
