Merge remote-tracking branch 'origin/develop' into feature/uninstallation

This commit is contained in:
Eric Espie
2026-04-14 11:38:05 +02:00
30 changed files with 734 additions and 131 deletions

View File

@@ -45,7 +45,11 @@ class DBBackupTest extends ItopTestCase
$oConfigToTest->Set('db_tls.enabled', false);
$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
$this->assertEmpty($sCliArgsNoTls);
if (CMDBSource::IsSslModeDBVersion()) {
$this->assertEquals(' --skip-ssl', $sCliArgsNoTls);
} else {
$this->assertEmpty($sCliArgsNoTls);
}
}
/**