[trees] exceptions on interrupted or timed out trees

splintered-reality · Nov 23, 2019 · c82bf7c · c82bf7c
1 parent c296a58
commit c82bf7c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.pydevproject b/.pydevproject
@@ -1,46 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-
+
+
 
 
 
 
 
 
     <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-
+
+
 
 
 
 
 
 
         <path>/${PROJECT_DIR_NAME}</path>
-
+
+
 
 
 
 
 
 
     </pydev_pathproperty>
-
+
+
 
 
 
 
 
 
     <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.6</pydev_property>
-
+
+
 
 
 
 
 
 
-    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python3.6</pydev_property>
-
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python3</pydev_property>
+                                
 
 
 
@@ -50,4 +55,5 @@
 
 
 
+
 </pydev_project>
diff --git a/py_trees_ros/trees.py b/py_trees_ros/trees.py
@@ -175,8 +175,8 @@ def setup(self, timeout: float=py_trees.common.Duration.INFINITE):
         try:
             super().setup(setup_timeout_sec, node=self.node)
         except RuntimeError as e:
-            if str(e) == "tree setup timed out":
-                raise exceptions.TimedOutError("tree setup timed out")
+            if str(e) == "tree setup interrupted or timed out":
+                raise exceptions.TimedOutError(str(e))
             else:
                 raise