cypress_test/Makefile.am | 4 ++--
cypress_test/package.json | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c782c033b00d1768e6bbc0b94c6ec302041199b0
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Tue Jan 21 16:51:41 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Tue Jan 21 17:37:28 2020 +0100
cypress: Use a better wait method for loolwsd server
Use the wait-on npm module for this.
Change-Id: I602f95aa79d46cf7b55bcc598e612bbc5342c52b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87150
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
Tested-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index fcb9b5201..3470e43dc 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -68,8 +68,8 @@ define start_loolwsd
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
- --o:logging.file[@enable]=true --o:logging.level=trace
> /dev/null 2>&1 &
- @sleep 10
+ --o:logging.file[@enable]=true --o:logging.level=trace
> /dev/null 2>&1 & \
+ node_modules/wait-on/bin/wait-on http://localhost:9980
@echo
endef
diff --git a/cypress_test/package.json b/cypress_test/package.json
index fe33a789f..463dc7efd 100644
--- a/cypress_test/package.json
+++ b/cypress_test/package.json
@@ -5,7 +5,8 @@
"license": "MPL-2.0",
"dependencies": {
"cypress": "3.8.1",
- "eslint": "6.8.0"
+ "eslint": "6.8.0",
+ "wait-on": "4.0.0"
},
"repository": {
"type": "git",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
