mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 18:48:51 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # application/cmdbabstract.class.inc.php # application/utils.inc.php # bootstrap.inc.php # composer.json # core/MyHelpers.class.inc.php # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/dbobject.class.php # core/kpi.class.inc.php # core/metamodel.class.php # lib/composer/autoload_classmap.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php
This commit is contained in:
@@ -84,4 +84,31 @@ class DBBackupTest extends ItopTestCase
|
||||
$this->assertStringStartsWith(' --ssl', $sCliArgsCapathCfg);
|
||||
$this->assertStringEndsWith('--ssl-ca='.DBBackup::EscapeShellArg($sTestCa), $sCliArgsCapathCfg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Host is localhost, we should be forced into tcp
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetMysqlCliTransportOptionWithLocalhost()
|
||||
{
|
||||
$sHost= 'localhost';
|
||||
$sTransport = DBBackup::GetMysqlCliTransportOption($sHost);
|
||||
|
||||
$this->assertStringStartsWith('--protocol=tcp', $sTransport);
|
||||
$this->assertStringEndsWith('--protocol=tcp', $sTransport);
|
||||
}
|
||||
|
||||
/**
|
||||
* Host is not localhost, we shouldn't be forced into tcp
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetMysqlCliTransportOptionWithoutLocalhost()
|
||||
{
|
||||
$sHost= '127.0.0.1';
|
||||
$sTransport = DBBackup::GetMysqlCliTransportOption($sHost);
|
||||
|
||||
$this->assertEmpty($sTransport);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user