vm-tests.yml: Fix installer tests

Signed-off-by: Tobias Knöppler <[email protected]>
nextcloud · Sep 5, 2024 · 94dd609 · 94dd609
1 parent 8538bfe
commit 94dd609
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
@@ -296,7 +296,7 @@ jobs:
               echo "${LOG_DIAG} Nextcloud log: "
               "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
-              cat ./raspbian_root/opt/ncdata/data/nextcloud.log |& awk "{ print \"${LOG_DIAG} \" \$0 }"
+              sudo cat ./raspbian_root/opt/ncdata/data/nextcloud.log |& awk "{ print \"${LOG_DIAG} \" \$0 }"
               sleep 12
               continue
             }

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
@@ -57,6 +57,7 @@ jobs:
           name: "${{ env.SSH_ARTIFACT_NAME }}"
           path: /__w/nextcloudpi/nextcloudpi/.ssh
           if-no-files-found: error
+          include-hidden-files: true
       - id: create-test-instance
         uses: ./.github/actions/create-test-instance
         with:
@@ -306,6 +307,7 @@ jobs:
           name: "${{ env.SSH_ARTIFACT_NAME }}"
           path: /__w/nextcloudpi/nextcloudpi/.ssh
           if-no-files-found: error
+          include-hidden-files: true
       - id: create-test-instance
         uses: ./.github/actions/create-test-instance-bullseye
         with:

diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py
@@ -198,7 +198,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver, skip_release_check:
                 elif re.match(r'.*Could not check for JavaScript support.*', warning.text):
                     continue
                 # TODO: Solve redis error logs at the source
-                elif re.match(r'.*\d+ errors in the logs since.*', warning.text):
+                elif re.match(r'.*\d+ errors? in the logs since.*', warning.text):
                     continue
                 else:
                     raise ConfigTestFailure(f"WARN: {warning.text}")