Skip to content

ci: initial acceptance test workflow #41552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
phil-davis wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

ci: initial acceptance test workflow #41552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b9c8131
ci: add initial acceptance test workflow
phil-davis May 19, 2026
434f0ca
ci: add some API acceptance test suites
phil-davis May 19, 2026
a8fc318
ci: run only one test suite for now
phil-davis May 19, 2026
7034b55
ci: find out why no priv for /var/www/html
phil-davis May 19, 2026
395087d
ci: temp reduce php unit workflows
phil-davis May 19, 2026
13ac5fb
ci: adjust /var/www permissions
phil-davis May 19, 2026
35b5d7c
ci: adjust server install
phil-davis May 19, 2026
2652a4d
ci: run apiFederationToRoot1 suite
phil-davis May 19, 2026
3437189
fix: avoid trying to access array offset on false
phil-davis May 20, 2026
8fd9f46
fix: handle passing null to normalizeUrl
phil-davis May 20, 2026
04ee051
ci: copy all files including hidden files
phil-davis May 20, 2026
ee32b84
fix: support federation between systems in subdirectories
phil-davis May 20, 2026
7e98dd2
test(deps): bump behat-related minor version dependencies
phil-davis May 20, 2026
a92e629
test(deps): pin symfony/yaml to 7.4.11
phil-davis May 20, 2026
49ab654
test: remove unneeded colons from behat.yml
phil-davis May 20, 2026
95c30c1
test: convert behat YML config to behat.php
phil-davis May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
516 changes: 516 additions & 0 deletions .github/workflows/acceptance.yml
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,20 @@ jobs:
uses: ./.github/workflows/php-unit.yml
with:
php-versions: '["8.3"]'

acceptance-api:
name: API Acceptance Tests
uses: ./.github/workflows/acceptance.yml
with:
do-api-tests: true
server-folder: 'server'
test-suites: "['apiComments']"

acceptance-api-federation:
name: API Acceptance Tests with Federation
uses: ./.github/workflows/acceptance.yml
with:
do-api-tests: true
server-folder: 'server'
federated-folder: 'federated'
test-suites: "['apiFederationToRoot1']"
9 changes: 0 additions & 9 deletions .github/workflows/php-unit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ jobs:
matrix:
php: ${{ fromJSON(inputs.php-versions) }}
database: [sqlite]
include:
- php: "8.3"
database: "mysql:8.0"
- php: "8.3"
database: "mariadb:10.6"
- php: "8.3"
database: "mariadb:10.11"
- php: "8.3"
database: "postgres:10.21"

services:
mysql:
Expand Down
3 changes: 3 additions & 0 deletions apps/federation/lib/DbHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,9 @@ protected function hash($url) {
* @return string
*/
protected function normalizeUrl($url) {
if ($url === null) {
$url = '';
}
$normalized = $url;

if (\strpos($url, 'https://') === 0) {
Expand Down
8 changes: 8 additions & 0 deletions apps/files_sharing/lib/External/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,20 +573,28 @@ protected function testUrl(IClientService $clientService, string $remote, bool $
public function testRemoteUrl(IClientService $clientService, string $remote) {
$parsed_host = parse_url($remote, PHP_URL_HOST);
$parsed_port = parse_url($remote, PHP_URL_PORT);
$parsed_path = parse_url($remote, PHP_URL_PATH);
if (\is_string($parsed_host)) {
$remote = $parsed_host;
if ($parsed_port !== null) {
$remote .= ':' . $parsed_port;
}
if ($parsed_path !== null) {
$remote .= $parsed_path;
}
} else {
$string_to_parse = 'http://' . $remote;
$parsed_host = parse_url($string_to_parse, PHP_URL_HOST);
$parsed_port = parse_url($string_to_parse, PHP_URL_PORT);
$parsed_path = parse_url($string_to_parse, PHP_URL_PATH);
if (\is_string($parsed_host)) {
$remote = $parsed_host;
if ($parsed_port !== null) {
$remote .= ':' . $parsed_port;
}
if ($parsed_path !== null) {
$remote .= $parsed_path;
}
}
}
try {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ public function fopen($path, $mode) {
if (!empty($encryptionModuleId)) {
$encryptionModule = $this->encryptionManager->getEncryptionModule($encryptionModuleId);
$shouldEncrypt = true;
} elseif (empty($encryptionModuleId) && $info['encrypted'] === true) {
} elseif ($info !== false && $info->isEncrypted()) {
// we come from a old installation. No header and/or no module defined
// but the file is encrypted. In this case we need to use the
// OC_DEFAULT_MODULE to read the file
Expand Down
Loading
Loading