Merge branch 'master' into az/service-cluster-properties

golemfactory · Jul 19, 2021 · 16e1398 · 16e1398
2 parents 9e6ecbe + 9510f6f
commit 16e1398
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/tests/goth_tests/test_run_blender.py b/tests/goth_tests/test_run_blender.py
@@ -77,9 +77,9 @@ async def test_run_blender(
             await all_sent.wait_for_result(timeout=120)
             logger.info("All tasks sent")
 
-            await all_computed.wait_for_result(timeout=30)
+            await all_computed.wait_for_result(timeout=120)
             logger.info("All tasks computed, waiting for Executor shutdown")
 
-            await cmd_monitor.wait_for_pattern(".*Executor has shut down", timeout=120)
+            await cmd_monitor.wait_for_pattern(".*Executor has shut down", timeout=180)
 
             logger.info("Requestor script finished")
diff --git a/tests/goth_tests/test_run_yacat.py b/tests/goth_tests/test_run_yacat.py
@@ -81,13 +81,13 @@ async def test_run_yacat(
             )
             logger.info("Keyspace found")
 
-            await all_sent.wait_for_result(timeout=30)
+            await all_sent.wait_for_result(timeout=60)
             logger.info("All tasks sent")
 
-            await all_computed.wait_for_result(timeout=60)
+            await all_computed.wait_for_result(timeout=120)
             logger.info("All tasks computed")
 
-            await cmd_monitor.wait_for_pattern(".*Password found: yo", timeout=10)
+            await cmd_monitor.wait_for_pattern(".*Password found: yo", timeout=60)
             logger.info("Password found, waiting for Executor shutdown")
 
             await cmd_monitor.wait_for_pattern(".*Executor has shut down", timeout=120)

diff --git a/yapapi/rest/activity.py b/yapapi/rest/activity.py
@@ -195,7 +195,11 @@ async def __aiter__(self) -> AsyncIterator[events.CommandEventContext]:
                 raise BatchTimeoutError()
             try:
                 results: List[yaa.ExeScriptCommandResult] = await self._api.get_exec_batch_results(
-                    self._activity_id, self._batch_id, _request_timeout=min(timeout, 5)
+                    self._activity_id,
+                    self._batch_id,
+                    command_index=last_idx,
+                    timeout=min(timeout, 5),
+                    _request_timeout=min(timeout, 5) + 1,
                 )
             except asyncio.TimeoutError:
                 continue