Commit graph

149 commits

Author SHA1 Message Date
Tamás Zolnai
0b8973696d cypress: interfer: we can enable retries for the test user.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I40172946709fc50290b568be26d510b4cbb12531
2021-02-02 16:00:46 +01:00
Tamás Zolnai
b52d169686 Revert "cypress: remove workaround for multi-user test cases."
This reverts commit c3e1986d63.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ib0d6d0972262b2ec82bc60672bf5ae27be32fb2e
2021-01-15 23:01:30 +01:00
Tamás Zolnai
c3e1986d63 cypress: remove workaround for multi-user test cases.
We had an issue with loading two views to the same document
at the same time.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I8b1ba92eca5e59bfa50cbcd637f1076d5e15c664
2021-01-14 15:04:13 +01:00
Miklos Vajna
78f192399d Revert "wsd: disable ssl by default, enable ssl termination by default"
This reverts commit f6bf6f49ed. I did not
consider that this makes it harder to do a local developer setup with
reverse proxy + make run; also that if you don't read the doc to set up
a reverse proxy, then the default now serves http content and advertises
https, which is not helping sysadmins.

This needs more thinking how to improve one scenario without hurting
others.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: Ic789faa2dc5bb19a79d651dc81d4eaaf0b48607a
2021-01-14 13:59:44 +01:00
Miklos Vajna
f6bf6f49ed wsd: disable ssl by default, enable ssl termination by default
The intention is to have defaults which are close to how people
typically use Online in production.

However, keep using ssl for 'make run', so that the https environment in
the browser is unchanged.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I7fd725a83b0e9ca1012f2c0e0c3bf038e5fa0059
2021-01-13 13:33:44 +01:00
Tamás Zolnai
7887056213 cypress: make: remove unneeded run_interactive_multi() funtcion.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ib6642b57a11d0ae181358fe74f0be48cbd65f774
2021-01-08 13:24:11 +01:00
Tamás Zolnai
1276580794 cypress: make: restructure and document desktop interference test functions.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I20c170a8da84191f333d7a9584ba073a3feebf40
2021-01-08 13:24:11 +01:00
Tamás Zolnai
45f1211899 cypress: make: restructure and document mobile interference test functions.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I5540d537672ff0384354d25a7c92111fa45fe927
2021-01-08 13:24:11 +01:00
Tamás Zolnai
ce43db6ec9 cypress: make: document multi-user test functions.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I304fc0e44c64f7eccf35f75f8eed6d9c1810bced
2021-01-08 13:24:11 +01:00
Tamás Zolnai
6672170932 cypress: make: remove unneeded '\' character.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ifb20a849e5f3e9115d6453eba63257d281cdbf9b
2021-01-08 13:24:11 +01:00
Tamás Zolnai
7fe262127e cypress: make: restructure and document run_multiuser_test() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ic4623cb89a97f32e88020c61996eddbe060e389e
2021-01-08 13:24:11 +01:00
Tamás Zolnai
66282b1030 cypress: make: move this echos to the rigth place.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ic77663a9c3debbe39e34ba5575cda381fa4d70ef
2021-01-08 12:24:03 +01:00
Tamás Zolnai
31fee645fc cypress: make: restructure and document run_desktop_tests() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I1c8138ae400e25ab198ea10acf438813b2b7eb6a
2021-01-08 12:24:03 +01:00
Tamás Zolnai
54ff9bf7ad cypress: make: restructure and document run_interactive_desktop() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ib409f724a8a4214fb473c96cda37fa54cf626df2
2021-01-08 12:24:03 +01:00
Tamás Zolnai
5dbf5a9c56 cypress: make: restructure and document run_mobile_tests() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I41b1dd78fb98897b11fd03f3e9778011b4faaa31
2021-01-08 12:24:03 +01:00
Tamás Zolnai
7413a298e4 cypress: make: restructure and document run_interactive_mobile() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I9ebd5f765f37757c310e2963ddbc0ca9b55668fc
2021-01-08 12:24:03 +01:00
Tamás Zolnai
9796f47994 cypress: make: extract run_test_headless() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Id1592c418e54a50c06db1ecb5d8f106b95b2502e
2021-01-08 12:24:03 +01:00
Tamás Zolnai
5398ef8591 cypress: make: fix build failure caused by not expected parallel build.
By now 'make check-mobile' and 'make check-desktop' commands
are not supposed to run in parallel. So 'make check-mobile -j3'
won't run mobile tests in parallel (three tests at once).
However, before this commit running these make rules with more
jobs, led to build failure. With this commit the build does not
fail, but still ignores the jobs and run the tests on a single job.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I13e13fdefcfb393ae5a42b4e065bbfe00278236a
2021-01-08 12:24:03 +01:00
Tamás Zolnai
c665ea0a6f cypress: make: extract run_test_parallel() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I7d89abfc5d98c3db37fed7ac266d57af639cfe73
2021-01-08 12:24:03 +01:00
Tamás Zolnai
34b64a3106 cypress: make: extract run_interactive_single() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ie9a84cbdfa95d53dcbf63eb4387d6cdc89ad6769
2021-01-08 12:24:03 +01:00
Tamás Zolnai
bf0a547804 cypress: make: extract run_interactive_all() function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I960f8271b92753d74bb338793a0d283a955ebffe
2021-01-08 12:24:03 +01:00
Tamás Zolnai
8c6a2da439 cypress: restructure makefile.
Too make it more organized.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Idf630df2813f6c7ce043b1f00db92105450ba814
2021-01-08 12:24:03 +01:00
Tamás Zolnai
4f9169bf8c cypress: remove content of cypress folder before test run.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ic4e637903df6768c42fcd404563455e19fa86cda
2021-01-04 16:30:40 +01:00
Tamás Zolnai
63ee524010 cypress: disable welcome dialog via loolwsd config.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I15c060e5eac1993116828dfaefe8916030fe2b63
2020-12-30 19:49:42 +01:00
Tamás Zolnai
09fbbf43b0 cypress: extract clean-up code into a function.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I572b164f89023cd66fca2d392b830417eb6a9d74
2020-12-29 10:42:51 +01:00
Tamás Zolnai
d6663d807f cypress: record the loolwsd's command line output.
So we can catch crashes / debug messages of core code.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ib11426e7fdd8f219be4715b3f1e2983ad33d7f2b
2020-12-18 21:20:27 +01:00
Tamás Zolnai
e8bad8ed60 cypress: add 'run-interfer-desktop' make command.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ibfb2bd3e6158da72a160cdfdc8507f9887cbdcfa
2020-12-10 13:36:34 +01:00
Tamás Zolnai
f917ece93a cypress: add 'check-interfer-desktop' make command.
To run interference tests for desktop tests.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ibe06399846a37345ab08fd830b6350fe12ba2e37
2020-12-10 13:36:34 +01:00
Tamás Zolnai
7a190deb21 cypress: restructure makefile: group interference related code.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I95bb115e41704d2912f3ed48b7e193ea648364f5
2020-12-10 13:36:34 +01:00
Tamás Zolnai
5f80d8290a cypress: fix 'run-multi' make command.
5 seconds gap between the two users was moved from
js code into the makefile in:
9ff0f3e9fe

We need it for interactive run too.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ic8aa541ce30f3146a61875ea66c904e65f0d6cf9
2020-12-08 14:24:18 +01:00
Tamás Zolnai
7422663234 cypress: put loolwsd log under cypress_test/workdir folder.
So it's easier to find the loolwsd.log of the last
called command.

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I4d597a3d6683360ef03f15061a68a30db8ae498e
2020-12-08 14:24:18 +01:00
Tamás Zolnai
bd6cfefc29 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
2020-12-08 14:24:18 +01:00
Tamás Zolnai
a95de9a799 cypress: remove this prototype of interference testing.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: Ibb7c84a2c701770cb4064c04223fc1fe041d624e
2020-12-01 13:25:20 +01:00
Tamás Zolnai
52bb718620 cypress: introduce interference testing for mobile tests.
Added `make check-interfer-mobile` command for running
interference tests. Now it works with writer tests.
I'll generalize it later.


Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I2181a8653d61cc6ed873e2887a3e42767f46f177
2020-12-01 13:25:20 +01:00
Tamás Zolnai
f399beaf65 cypress: multi-user: avoid running more tests in parallel.
We have more users running already for one test, better
to avoid side-ffects coming from running more multi-user
test in parallel (they are using the same loolwsd).

Change-Id: I1cbed36a3ffe2825c384b525da361c4cfe781b38
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-11-19 11:02:29 +01:00
Tamás Zolnai
0f5042f76f cypress: multi-user: move retries config to a shared place.
Change-Id: I7939395b88c7a74a1e0016ec78c95ef46a5a31ec
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-11-19 11:02:29 +01:00
Tamás Zolnai
9ff0f3e9fe cypress: multi-user: move this document opening gap to the make file.
Change-Id: Ib37d8d29e8965712975e27a4577a4f1b6a0e35a0
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-11-19 11:02:29 +01:00
Tamás Zolnai
7886d63349 cypress: remove php-proxy simulation.
We have a way of running the tests against
the actualy php-proxy script:

CYPRESS_INTEGRATION="php-proxy" make check

So let's remove the C++ implementation, so we don't
need to maintain a duplicated code.

Change-Id: Ie095a70a8175cc8cb4894905826d13762127b148
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-10-26 19:28:31 +01:00
Tamás Zolnai
5b0676bc3a cypress: protoype an interference test.
The idea it to run an existing cypress test while
the same document is opened by a second user. The second
user does some activity (e.g. moving cursor, clicking, etc)
and we check whether it makes any interference with the first
user's view. The first user is doing the actual test's steps,
so we can see if interference breaks the assertions.

Now it's just a prototype for testing it in the CI setup.

Change-Id: I3e02c037754862d628c73bbb4b2d82ea84b8a719
2020-10-23 16:09:00 +02:00
Andrea Gelmini
596b26c7d9 Fix typo in code
Change-Id: I0ef8fe7ff382d7cb295aa8054721448d9bf8e477
2020-10-07 12:46:37 +02:00
Tamás Zolnai
55c75144f7 cypress: fail on missing LO installation.
Jenkins sometimes does not work properly and core
installation is not accessible for online build.
In this case the test build was passing without
actually run the tests. Fail on this instead to
avoid getting untested patches in the code repo.

Change-Id: I35c49562dfeaeda5f6c8aa4bd3a746b1f04de3ea
2020-10-05 13:32:12 +02:00
Tamás Zolnai
5c2f5eac2e cypress: use built-in test retries.
It's more effective, since it reruns only the failing test,
not the whole test suite. Also it has a nicer output.

Change-Id: I8a50a20366b76a5cedb4e9383220c53f367c5a68
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102995
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-09-18 12:50:45 +02:00
Tamás Zolnai
f6d5cf9c3f cypress: support running tests with php-proxy.
Change-Id: I9fe4a974582e0475026f6798a338bae033e6d7e6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102733
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-09-15 15:40:22 +02:00
Tamás Zolnai
ebd040cacb cypress: support running test with nextcloud integration.
Change-Id: I0b2255225a6c0eca5317559df33bb12b841dac08
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102260
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-09-10 14:03:24 +02:00
Tamás Zolnai
0d7a58aa57 cypress: add 'make check-proxy-mobile' command.
To run mobile test with php-proxy simulation.
It's an initial command, should be improved later,
after php proxy simulation nicely works with the
tests.

Change-Id: Id9d2bacfbf09ca34a2c84e0d32808749df4c1909
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102321
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-09-09 15:50:35 +02:00
Tamás Zolnai
433b108c50 cypress: simplify this.
Change-Id: I4b055f13caebd7f034c4aa8aea724aff300c113d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101766
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-09-01 00:20:18 +02:00
Tamás Zolnai
d6005f0947 cypress: add a way to run tests with different browsers.
e.g. CYPRESS_BROWSER="firefox" make check

Change-Id: I3017179152c6e875df667da5081abb0c8cde60b1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101733
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-08-31 15:40:44 +02:00
Tamás Zolnai
b56cff6520 cypress: introduce make check-firefox command.
To run all cypress tests inside firefox browser.

Change-Id: I965666e8b6b7aad5a45d1fef4fc9a078aa30615d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100441
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-08-11 12:08:58 +02:00
Tamás Zolnai
cfc62f864d cypress: use actual LOOLWSD version hash.
The related issue was fixed upstream.

Change-Id: I8b1191d3c0d5543233ace9322a7d768b3424d62d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100435
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-08-10 15:37:46 +02:00
Tamás Zolnai
9c312a4cc6 cypress: group multi-user tests based on component.
Change-Id: Ic2689b8e05c9827807585a4a718f112e23d1e5a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100324
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-08-07 15:37:14 +02:00