Skip to content

Commit

Permalink
Add full integrationtests to pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
R0Wi committed Feb 7, 2025
1 parent a6210f7 commit 3836d56
Show file tree
Hide file tree
Showing 3 changed files with 257 additions and 68 deletions.
114 changes: 114 additions & 0 deletions .github/workflows/phpunit-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
name: PHPUnit-Integration

on:
pull_request:
push:
branches:
- master
- stable*
- add-integrationtest-to-#51 # TODO :: remove

env:
APP_NAME: workflow_ocr
NEXTCLOUD_PORT: 8080
NEXTCLOUD_USER: "admin"
NEXTCLOUD_PASS: "password"
NC_HAPROXY_PASSWORD: "some_secure_password"
NC_HAPROXY_PORT: 2375

jobs:
# Do not change this name, it is used in the integration tests
github-php-integrationtests:
runs-on: ubuntu-24.04
services:
docker-socker-proxy:
image: ghcr.io/nextcloud/nextcloud-appapi-dsp:release
env:
NC_HAPROXY_PASSWORD: "some_secure_password"
options: --privileged
volumes:
- /var/run/docker.sock:/var/run/docker.sock
ports:
- 2375:2375

strategy:
fail-fast: false
matrix:
php-versions: ['8.3']
databases: ['sqlite']
server-versions: ['stable31']

name: php-integrationtests${{ matrix.php-versions }}-${{ matrix.databases }}

steps:
- name: Checkout server
uses: actions/checkout@v4
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Checkout app
uses: actions/checkout@v4
with:
path: apps/${{ env.APP_NAME }}

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd, zip, imagick
coverage: none

- name: Install composer dependencies
working-directory: apps/${{ env.APP_NAME }}
run: composer i

- name: Set up Nextcloud
env:
DB_PORT: 4444
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud \
--database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword \
--admin-user ${{ env.NEXTCLOUD_USER }} --admin-pass ${{ env.NEXTCLOUD_PASS }}
./occ app:enable ${{ env.APP_NAME }}
php -S localhost:${{ env.NEXTCLOUD_PORT }} &
- name: Checkout AppApi
uses: actions/checkout@v4
with:
repository: nextcloud/app_api
ref: ${{ matrix.server-versions }}
path: apps/app_api

# TODO :: setup according to environment (e.g. stable31)
- name: Set up AppApi/ExApp infrastructure
run: |
./occ app:enable app_api
./occ app_api:daemon:register local_docker "docker-socker-proxy" \
"docker-install" "http" "localhost:${{ env.NC_HAPROXY_PORT }}" "http://localhost:${{ env.NEXTCLOUD_PORT }}" \
--set-default --haproxy_password="${{ env.NC_HAPROXY_PASSWORD }}"
./occ app_api:app:register workflow_ocr_backend \
--wait-finish \
--info-xml https://raw.githubusercontent.com/R0Wi-DEV/workflow_ocr_backend/refs/heads/master/appinfo/info.xml
- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: make php-integrationtest

- name: Output logs
if: failure()
run: |
echo "Nextcloud logs:"
cat data/nextcloud.log
echo ""
echo "OCR Backend logs:"
docker logs nc_app_workflow_ocr_backend
9 changes: 7 additions & 2 deletions lib/Service/OcrService.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use OCA\Files_Versions\Versions\IMetadataVersion;
use OCA\Files_Versions\Versions\IMetadataVersionBackend;
use OCA\Files_Versions\Versions\IVersionManager;
use OCA\WorkflowOcr\Exception\OcrNotPossibleException;
use OCA\WorkflowOcr\Exception\OcrResultEmptyException;
use OCA\WorkflowOcr\Helper\IProcessingFileAccessor;
use OCA\WorkflowOcr\Model\WorkflowSettings;
Expand Down Expand Up @@ -138,6 +139,10 @@ public function runOcrProcess(int $fileId, string $uid, WorkflowSettings $settin
$this->initUserEnvironment($uid);

$file = $this->getNode($fileId);

if (!$file->isReadable()) {
throw new OcrNotPossibleException('File with id \'' . $fileId . '\' is not readable');
}

$fileMtime = null;
if ($settings->getKeepOriginalFileDate()) {
Expand Down Expand Up @@ -282,14 +287,14 @@ private function setFileVersionsLabel(File $file, string $uid, string $label): v

foreach ($versions as $version) {
if (!$version instanceof IMetadataVersion) {
$this->logger->debug('Skipping version with revision id {versionId} because "{versionClass}" is not an IMetadataVersion', ['versionId' => $revisionId, 'versionClass' => get_class($version)]);
$this->logger->debug('Skipping version with revision id {versionId} because "{versionClass}" is not an IMetadataVersion', ['versionClass' => get_class($version)]);
continue;
}

$versionBackend = $version->getBackend();

if (!$versionBackend instanceof IMetadataVersionBackend) {
$this->logger->debug('Skipping version with revision id {versionId} because its backend "{versionBackendClass}" does not implement IMetadataVersionBackend', ['versionId' => $revisionId, 'versionBackendClass' => get_class($versionBackend)]);
$this->logger->debug('Skipping version with revision id {versionId} because its backend "{versionBackendClass}" does not implement IMetadataVersionBackend', ['versionBackendClass' => get_class($versionBackend)]);
continue;
}

Expand Down
Loading

0 comments on commit 3836d56

Please sign in to comment.