summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2020-12-08 13:26:38 +0100
committerTamás Zolnai <zolnaitamas2000@gmail.com>2020-12-08 14:24:18 +0100
commitbd6cfefc29c49e49296c3eb99228874e2519eb95 (patch)
tree3a7d31929fc7c846e5776e19378663ea1810cab9
parentmobilewizard: warn children data type check (diff)
downloadonline-bd6cfefc29c49e49296c3eb99228874e2519eb95.tar.gz
online-bd6cfefc29c49e49296c3eb99228874e2519eb95.zip
cypress: add 'run-interfer-mobile' make command.
For running interference test in interactive mode. The interference user is run in the background and the user running the test code is displayed in the interactive test runner. Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com> Change-Id: I3595a618f78603ed3e5321969a7395b60555470b
-rw-r--r--cypress_test/Makefile.am29
1 files changed, 29 insertions, 0 deletions
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index ce84525d5b..128ab04d36 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -197,6 +197,26 @@ run-multi: @JAILS_PATH@ $(NODE_BINS)
$(call run_interactive_multi,$(INTERACTIVE_USER_SPEC)) || true
@$(KILL_COMMAND) || true
+run-interfer-mobile: @JAILS_PATH@ $(NODE_BINS)
+ $(call run_JS_error_check)
+ $(call start_loolwsd)
+ @echo
+ @echo "Running interfer mobile test in interactive test runner..."
+ @echo
+ $(eval BACKGROUND_USER_SPEC=interference_user_spec.js)
+ $(eval INTERACTIVE_USER_SPEC=$(spec))
+ $(eval BACKGROUND_USER_LOG=$(MULTIUSER_TRACK_FOLDER)/$(BACKGROUND_USER_SPEC).log)
+ $(call run_interactive_interfer_mobile,$(INTERACTIVE_USER_SPEC)) & \
+ sleep 5
+ @$(PARALLEL_SCRIPT) \
+ --browser $(BROWSER) \
+ --config $(INTERFER_MOBILE_CONFIG2) \
+ --env $(INTERFER_MOBILE_ENV2) \
+ --spec $(BACKGROUND_USER_SPEC) \
+ --type multi-user \
+ --log-file $(BACKGROUND_USER_LOG) || true
+ @$(KILL_COMMAND) || true
+
run-cov: do-run-cov
$(if $(wildcard $(ERROR_LOG)),@cat $(ERROR_LOG))
@@ -316,6 +336,15 @@ define run_interactive_multi
--spec=$(abs_dir)/integration_tests/multiuser/$(1)
endef
+define run_interactive_interfer_mobile
+ $(CYPRESS_BINARY) run \
+ --browser $(BROWSER) \
+ --headed --no-exit \
+ --config $(INTERFER_MOBILE_CONFIG1) \
+ --env $(INTERFER_MOBILE_ENV1) \
+ --spec=$(abs_dir)/integration_tests/mobile/$(1)
+endef
+
define run_desktop_tests
@echo $(if $(1),"Running cypress desktop test: $(1)","Running cypress desktop tests...")
@echo