From 18ae60e50d54cc308a5cd86fd57a8a8e5a629014 Mon Sep 17 00:00:00 2001 From: Gabriel Jover-Manas Date: Fri, 21 Mar 2014 17:57:13 +0100 Subject: TangoMacroExecutor _stop() only handles PyTango.DevFailed When any exception occurs in TangoMacroExecutor _stop() method when stopping a macro, it will only catch PyTango.DevFailed exception --- src/sardana/tango/macroserver/test/macroexecutor.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) mode change 100644 => 100755 src/sardana/tango/macroserver/test/macroexecutor.py (limited to 'src/sardana/tango') diff --git a/src/sardana/tango/macroserver/test/macroexecutor.py b/src/sardana/tango/macroserver/test/macroexecutor.py old mode 100644 new mode 100755 index 0e0f8c0c..655bfaa9 --- a/src/sardana/tango/macroserver/test/macroexecutor.py +++ b/src/sardana/tango/macroserver/test/macroexecutor.py @@ -125,10 +125,7 @@ class TangoMacroExecutor(BaseMacroExecutor): try: self._door.StopMacro() except PyTango.DevFailed, e: - #TODO: what to do with Exceptions??? - print 'DevFailed exception was thrown: ', e - except Exception, e: - print 'Exception was thrown: ', e + raise Exception("Unable to Stop macro: %s"% e) def _registerLog(self, log_level): log_cb = TangoLogCb(self, log_level) -- cgit v1.2.3