[Libreoffice-commits] online.git: cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

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

New commits:
commit fdcdcedbfa00802b87ebc6850556676c36f9e1ab
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Feb 21 17:57:55 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Feb 21 19:43:27 2020 +0100

    cypress: don't wait on loolwsd server forever.
    
    Use one minutes timeout.
    
    Change-Id: Ia4e351088d7bd152b4c7f47c66dce2a88f14970c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89232
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index e7ca4d75b..1d0910dca 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -80,7 +80,7 @@ define start_loolwsd
 			--o:logging.file[@enable]=true --o:logging.level=trace > /dev/null 2>&1 \
 			--port=$(FREE_PORT) \
 			--pidfile=$(PID_FILE) &
-	@node_modules/wait-on/bin/wait-on http://localhost:$(FREE_PORT)
+	@node_modules/wait-on/bin/wait-on http://localhost:$(FREE_PORT) --timeout 60000
 	@echo
 endef