Merge branch 'master' into feature/vertex-pipeline

tests/conftest.py

@@ -62,16 +62,16 @@ def await_queue(super_client=None):
         assert not super_client.get_process_logs(status='error')
 
     @staticmethod
-    def await_queue_edit(super_client, edit_id=None, invitation=None):
-        print('await_queue_edit', edit_id)
+    def await_queue_edit(super_client, edit_id=None, invitation=None, count=1, error=False):
+        expected_status = 'error' if error else 'ok'
         while True:
             process_logs = super_client.get_process_logs(id=edit_id, invitation=invitation)
-            if process_logs:
+            if len(process_logs) >= count and all(process_log['status'] == expected_status for process_log in process_logs):
                 break
 
             time.sleep(0.5)
 
-        assert process_logs[0]['status'] == 'ok'
+        assert process_logs[0]['status'] == (expected_status), process_logs[0]['log']
 
 
     @staticmethod