upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(tests): Fix encryption test isolation between test runs

Browse source 
Add global encryption teardown to TestCase base class so encryption state
does not leak between test suites regardless of which tests ran earlier.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <steve@cuppett.com>
This commit is contained in:
Stephen Cuppett 2026-04-29 11:59:09 -04:00
parent b81a45b560
commit c2e2b5704d
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/lib/TestCase.php
View file

@ -27,6 +27,7 @@ use OC\User\Session;
use OCP\Command\IBus;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\IRootFolder;
use OCP\IAppConfig;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IUserManager;
@ -195,6 +196,22 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
call_user_func([$this, $methodName]);
}
}
// Clean up encryption state to prevent test pollution
// This ensures encryption_enabled is reset after each test, preventing
// MultiKeyEncryptException failures in subsequent tests when encryption
// is left enabled but user keys don't exist
try {
$appConfig = Server::get(IAppConfig::class);
$currentValue = $appConfig->getValueBool('core', 'encryption_enabled', false);
if ($currentValue) {
$appConfig->setValueBool('core', 'encryption_enabled', false);
$appConfig->deleteKey('core', 'default_encryption_module');
$appConfig->deleteKey('encryption', 'useMasterKey');
}
} catch (\Throwable $e) {
// Ignore - may be called before bootstrap completes
}
}
/**