If the timeout in _poll_async_result has expired, raise the exception (…

…#35878)
ansible · Feb 8, 2018 · 82c1456 · 82c1456
1 parent 0ccef03
commit 82c1456
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
@@ -729,7 +729,12 @@ def _poll_async_result(self, result, templar, task_vars=None):
                 except AttributeError:
                     pass
 
-            time_left -= self._task.poll
+                # Little hack to raise the exception if we've exhausted the timeout period
+                time_left -= self._task.poll
+                if time_left <= 0:
+                    raise
+            else:
+                time_left -= self._task.poll
 
         if int(async_result.get('finished', 0)) != 1:
             if async_result.get('_ansible_parsed'):