Skip to content

ci: re-enable winvfs tests #12515

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

Merged
modSpike merged 3 commits into from
Apr 17, 2026
Merged

ci: re-enable winvfs tests #12515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84991fc
Limit number of parallel test to 1 on Windows
erikjv Apr 16, 2026
5d565a1
Revert "Temporarily disable WinVFS tests (#12469)"
erikjv Apr 16, 2026
9b1180b
Revert "[DC-270] Disable WinVfs test itself (#12470)"
erikjv Apr 16, 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
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@ jobs:
os: windows-latest
container:
useSonarCloud: ${{ github.event_name != 'pull_request' }}
testOptions: --options '[Compile]Jobs=1'
# TODO: align the target with the name
- name: macos-clang-arm64
target: macos-clang-arm64
os: macos-latest
container:
useSonarCloud:
testOptions:
Comment thread
modSpike marked this conversation as resolved.
- name: linux-gcc-x86_64
target: linux-64-gcc
os: ubuntu-latest
container: owncloudci/appimage-build:sles15-amd64
useSonarCloud:
testOptions:
name: ${{ matrix.name }}

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -160,7 +163,7 @@ jobs:

- name: Run tests
run: |
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test owncloud/owncloud-client
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test ${{ matrix.testOptions }} owncloud/owncloud-client

- name: Package
run: |
Expand Down
22 changes: 11 additions & 11 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ owncloud_add_test(JobQueue)

add_subdirectory(modeltests)

# if(WIN32)
# find_file(cldapi_FOUND CldApi.dll)
# if (cldapi_FOUND)
# include("${CMAKE_SOURCE_DIR}/test/owncloud_add_test.cmake")
# owncloud_add_test(WinVfs)
# target_link_libraries(WinVfsTest vfs_plugin_win_static)
# add_dependencies(WinVfsTest vfs_wincfapi)
# else()
# message(WARNING "Failed to detect CldApi.dll: Skipping WinVfsTest")
# endif()
# endif()
if(WIN32)
find_file(cldapi_FOUND CldApi.dll)
if (cldapi_FOUND)
include("${CMAKE_SOURCE_DIR}/test/owncloud_add_test.cmake")
owncloud_add_test(WinVfs)
target_link_libraries(WinVfsTest vfs_plugin_win_static)
add_dependencies(WinVfsTest vfs_wincfapi)
else()
message(WARNING "Failed to detect CldApi.dll: Skipping WinVfsTest")
endif()
endif()
2 changes: 1 addition & 1 deletion test/testblacklist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testdatabaseerror.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testdownload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testlocaldiscovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testlockedfiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testpermissions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testremotediscovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
4 changes: 2 additions & 2 deletions test/testsyncconflict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
} else if (Utility::isWindows()) {
qWarning("Skipping Vfs::WindowsCfApi");
}
Expand Down
2 changes: 1 addition & 1 deletion test/testsyncdelete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
2 changes: 1 addition & 1 deletion test/testsyncengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
4 changes: 2 additions & 2 deletions test/testsyncmove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down Expand Up @@ -992,7 +992,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off;
#ifdef Q_OS_WIN32
if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi") << Vfs::WindowsCfApi;
QTest::newRow("Vfs::WindowsCfApi") << Vfs::WindowsCfApi;
} else {
qWarning("Skipping Vfs::WindowsCfApi");
}
Expand Down
2 changes: 1 addition & 1 deletion test/testuploadreset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private Q_SLOTS:
QTest::newRow("Vfs::Off") << Vfs::Off << false;

if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
// QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;
QTest::newRow("Vfs::WindowsCfApi dehydrated") << Vfs::WindowsCfApi << true;

// TODO: the hydrated version will fail due to an issue in the winvfs plugin, so leave it disabled for now.
// QTest::newRow("Vfs::WindowsCfApi hydrated") << Vfs::WindowsCfApi << false;
Expand Down
Loading