cypress_test/Makefile.am | 9 +++++++-- cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js | 2 +- cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 5b106d9edd5608bd3c7a3a95c44d4fc03b0c71b6 Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Jul 30 11:46:38 2020 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Jul 30 15:26:19 2020 +0200 cypress: fix-up check-multi command. We need to introduce separate rules to dump the log and to dump out the error message. Otherwise GNU make evaluation breaks the workflow. It evaluates $(wildcard $(ERROR_LOG)) before the test were actually executed. So first run the tests, then dump the error output and then go into error state. Change-Id: I0f8e5de6800f0691cca14019819972437a741382 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99781 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index a1b3acfcf..1908215b0 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -125,7 +125,13 @@ check-mobile: @JAILS_PATH@ $(NODE_BINS) $(call run_mobile_tests,$(spec)) @$(KILL_COMMAND) || true -check-multi: @JAILS_PATH@ $(NODE_BINS) +check-multi: do-multi-check-log + $(if $(wildcard $(ERROR_LOG)),$(error CypressError: some tests failed!)) + +do-multi-check-log: do-multi-check + $(if $(wildcard $(ERROR_LOG)),@cat $(ERROR_LOG)) + +do-multi-check: @JAILS_PATH@ $(NODE_BINS) @rm -f $(ERROR_LOG) $(call run_JS_error_check) $(call start_loolwsd) @@ -133,7 +139,6 @@ check-multi: @JAILS_PATH@ $(NODE_BINS) $(call run_multiuser_test,$(spec)), \ $(call run_all_multiuser_tests)) @$(KILL_COMMAND) || true - $(if $(wildcard $(ERROR_LOG)),@cat $(ERROR_LOG)) run-desktop: @JAILS_PATH@ $(NODE_BINS) $(call run_JS_error_check) commit d43c97a9efe0c761ae06026027ca8452b1e2ff85 Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Jul 30 10:59:56 2020 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Jul 30 15:26:05 2020 +0200 cypress: make simultaneous typing test more stable. Sometimes this text contains an additional end line character. Change-Id: Id58eab9ea3b082781cdd8ec341fa2b058ba3b17e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99770 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js b/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js index e618512dc..293617bf5 100644 --- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js +++ b/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js @@ -32,7 +32,7 @@ describe('Simultaneous typing: user-1.', function() { helper.selectAllText(); cy.get('#copy-paste-container p') - .should('have.text', text); + .should('contain.text', text); // Change paragraph alignment to trigger user-2 actions cy.get('textarea.clipboard') diff --git a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js b/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js index 5e4eea2ee..dc4873d56 100644 --- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js +++ b/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js @@ -32,7 +32,7 @@ describe('Simultaneous typing: user-2.', function() { helper.selectAllText(); cy.get('#copy-paste-container p') - .should('have.text', text); + .should('contain.text', text); // user-1 changes the paragraph alignment after finished cy.get('#tb_editbar_item_centerpara .w2ui-button') _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
