cypress_test/Makefile.am | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 732a69e69b12969f11bc7457b6d60d5a645c9541
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Mar 26 14:43:32 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Thu Mar 26 15:58:22 2020 +0100
cypress: use hardcoded value as WSD hash.
cypress test framework has a problem with some
specific hashes (for example: 769e98018) and it
do not pass these values to the test code, which
make all test fail with 404 error.
Change-Id: I385b1621de25fdf90e6169bdff25eaf3c18cf81e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91101
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 394627af7..3752180fd 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -29,6 +29,8 @@ DISPLAY_NUMBER = 100
HEADLESS_BUILD := $(findstring Command failed,$(shell xhost > /dev/null 2>&1
|| echo "Command failed, so we are in a headless environment."))
export DISPLAY=$(if $(HEADLESS_BUILD),:$(DISPLAY_NUMBER),$(shell echo
$$DISPLAY))
+WSD_VERSION_HASH := "11111111"
+
if HAVE_LO_PATH
MOBILE_TEST_FILES= \
calc/apply_font_spec.js \
@@ -113,7 +115,7 @@ run-desktop: @JAILS_PATH@ $(NODE_BINS)
@echo "Open cypress with desktop tests..."
@echo
$(CYPRESS_BINARY) open --config
integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \
- --env
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
+ --env
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
|| true
@$(KILL_COMMAND) || true
@@ -123,7 +125,7 @@ run-mobile: @JAILS_PATH@ $(NODE_BINS)
@echo "Open cypress with mobile tests..."
@echo
$(CYPRESS_BINARY) open --config
integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
- --env
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
+ --env
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
|| true
@$(KILL_COMMAND) || true
@@ -169,7 +171,7 @@ define run_desktop_tests
$(CYPRESS_BINARY) run --browser $(CHROME) \
--config
integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \
--headless \
- --env
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
+ --env
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
$(if $(1),
--spec=$(abs_dir)/integration_tests/desktop/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\
@@ -186,7 +188,7 @@ define run_mobile_tests
$(CYPRESS_BINARY) run --browser $(CHROME) \
--config
integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
--headless \
- --env
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
+ --env
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
$(if $(1),
--spec=$(abs_dir)/integration_tests/mobile/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
