[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ac3ca2245eefab1f430fcfd234a1be30a845635
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 26 15:06:29 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Aug 7 15:56:01 2020 +0200

    cypress: improve error matcher.
    
    Change-Id: Idad9b6a37b86160c65e0af25bee844652b83f77b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97229
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit e3ffd544a31ed6a06dc43b0cbc09c9d0b6a07191)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100327

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 907a481c2..e76430594 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -211,7 +211,7 @@ define run_mobile_tests
 	)
 endef
 
-ERROR_MATCHER = "Error:\|Command failed:\|Timed out retrying"
+ERROR_MATCHER = "Error:\|Command failed:\|Timed out retrying\|The error was:"
 
 define execute_run_parallel
 	@mkdir -p $(dir $(2)) && touch $(2) && \