2 new revisions: Revision: 2f24b5cbef29 Author: Mikko Korpela <[email protected]> Date: Wed Jun 15 23:28:18 2011 Log: Backed out changeset 7b7dff779509... http://code.google.com/p/robotframework/source/detail?r=2f24b5cbef29
Revision: 48dd6c67a21a Author: Mikko Korpela <[email protected]> Date: Wed Jun 15 23:28:48 2011 Log: merge http://code.google.com/p/robotframework/source/detail?r=48dd6c67a21a ============================================================================== Revision: 2f24b5cbef29 Author: Mikko Korpela <[email protected]> Date: Wed Jun 15 23:28:18 2011 Log: Backed out changeset 7b7dff779509 This changeset was based on faulty measurements.. Backing out. http://code.google.com/p/robotframework/source/detail?r=2f24b5cbef29 Modified: /src/robot/utils/robotthread.py ======================================= --- /src/robot/utils/robotthread.py Wed Jun 15 12:45:57 2011 +++ /src/robot/utils/robotthread.py Wed Jun 15 23:28:18 2011 @@ -26,18 +26,18 @@ def __init__(self, runnable, args=None, kwargs=None, notifier=None): self._runnable = lambda: runnable(*(args or ()), **(kwargs or {})) + self._notifier = Event() self._result = None self._error = None self._traceback = None self._thread = None - self._exception_occurred = False def run(self): try: self._result = self._runnable() except: - self._exception_occurred = True self._error, self._traceback = sys.exc_info()[1:] + self._notifier.set() __call__ = run @@ -45,8 +45,8 @@ self._thread = Thread(self) self._thread.setDaemon(True) self._thread.start() - self._thread.join(timeout) - return not self._thread.isAlive() and not self._exception_occurred + self._notifier.wait(timeout) + return self._notifier.isSet() def get_result(self): if self._error: ============================================================================== Revision: 48dd6c67a21a Author: Mikko Korpela <[email protected]> Date: Wed Jun 15 23:28:48 2011 Log: merge http://code.google.com/p/robotframework/source/detail?r=48dd6c67a21a
