cypress_test/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4246d1e73a763c7a18d49fa99052281d653528b6
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Fri Apr 3 18:05:27 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Fri Apr 3 18:19:33 2020 +0200
cypress: Catch also timout error of the new cypress-wait-until package.
Change-Id: I0b9856bbf933040a107c6cb8fe738d7a9f30a4a1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91653
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index a5a2f30ef..486014cde 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -202,7 +202,7 @@ endef
define execute_run_parallel
@mkdir -p $(dir $(2)) && touch $(2) && \
echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
- if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught
TypeError" $(2)` ];\
+ if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught
TypeError\|Error: Timed out retrying" $(2)` ];\
then cat $(2);\
else cat $(2) >> $(ERROR_LOG);\
fi;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
