Fix litmus and acceptance tests in GitHub Actions

cs3org · Jan 27, 2023 · f655002 · f655002
1 parent dfa2a56
commit f655002
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-tests.md b/changelog/unreleased/fix-tests.md
@@ -0,0 +1,3 @@
+Bugfix: Fix litmus and acceptance tests in GitHub Actions
+
+https://github.com/cs3org/reva/pull/3633
diff --git a/tests/docker-compose/acceptance-1.yml b/tests/docker-compose/acceptance-1.yml
@@ -39,7 +39,6 @@ services:
   acceptance-1:
     image: cs3org/behat:latest
     environment:
-      PATH_TO_CORE: /mnt/ocis
       PATH_TO_APITESTS: /mnt/ocis
       TEST_SERVER_URL: http://frontend:20180
       OCIS_REVA_DATA_ROOT: /var/tmp/reva/data/
@@ -50,7 +49,11 @@ services:
       REGULAR_USER_PASSWORD: relativity
       SEND_SCENARIO_LINE_REFERENCES: 'true'
       BEHAT_SUITE: apiVirtualViews
-    command: /mnt/ocis/tests/acceptance/run.sh --type api
+    command:
+      - -c
+      - |
+        sleep 5
+        /mnt/ocis/tests/acceptance/run.sh --type api
     volumes:
       - shared-volume:/var/tmp
       - ./tests/testing:/mnt/testing

diff --git a/tests/docker-compose/common.yml b/tests/docker-compose/common.yml
@@ -7,7 +7,16 @@ services:
     working_dir: /etc/revad/
   litmus:
     image: registry.cern.ch/docker.io/owncloud/litmus:latest
+    entrypoint:
+      - /bin/sh
+    command:
+      - -c
+      - |
+        sleep 5
+        /usr/local/bin/litmus-wrapper
     environment:
       LITMUS_USERNAME: einstein
       LITMUS_PASSWORD: relativity
-      TESTS: basic http copymove props
+      TESTS: basic http copymove props
+      LITMUS_WAIT: 'true'
+      LITMUS_CHECK_URL: http://frontend:20080/ocs/v2.php/cloud/capabilities