diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-12-08 13:56:20 +0100 |
---|---|---|
committer | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2020-12-08 14:24:18 +0100 |
commit | 5f80d8290a9274cfce97682ae24593a4fa960517 (patch) | |
tree | 220b76703df81f59f4ebd5f428a516cd0d345367 | |
parent | cypress: put loolwsd log under cypress_test/workdir folder. (diff) | |
download | online-5f80d8290a9274cfce97682ae24593a4fa960517.tar.gz online-5f80d8290a9274cfce97682ae24593a4fa960517.zip |
cypress: fix 'run-multi' make command.
5 seconds gap between the two users was moved from
js code into the makefile in:
9ff0f3e9fee8c1bc735bc5a6316d73e42f9e4238
We need it for interactive run too.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ic8aa541ce30f3146a61875ea66c904e65f0d6cf9
-rw-r--r-- | cypress_test/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 790a5afe5e..21d9d375b4 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -203,6 +203,7 @@ run-multi: @JAILS_PATH@ $(NODE_BINS) --spec $(BACKGROUND_USER_SPEC) \ --type multi-user \ --log-file $(BACKGROUND_USER_LOG) & + @sleep 5 $(call run_interactive_multi,$(INTERACTIVE_USER_SPEC)) || true @$(KILL_COMMAND) || true @@ -216,8 +217,8 @@ run-interfer-mobile: @JAILS_PATH@ $(NODE_BINS) $(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 + $(call run_interactive_interfer_mobile,$(INTERACTIVE_USER_SPEC)) & + @sleep 5 @$(PARALLEL_SCRIPT) \ --browser $(BROWSER) \ --config $(INTERFER_MOBILE_CONFIG2) \ |