зеркало из https://github.com/microsoft/msphpsql.git
Skipped some tests when running against Azure (#874)
This commit is contained in:
Родитель
f4ad2ae1d4
Коммит
3679b48df2
|
@ -6,7 +6,7 @@ emalloc (which only allocate memory in the memory space allocated for the PHP pr
|
|||
--ENV--
|
||||
PHPT_EXEC=true
|
||||
--SKIPIF--
|
||||
<?php require('skipif.inc'); ?>
|
||||
<?php require('skipif_azure.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
include 'MsCommon.inc';
|
||||
|
|
|
@ -4,7 +4,7 @@ verify github issue52 is fixed.
|
|||
This test only works in previous versions of SQL Servers. Full-text search features are
|
||||
deprecated starting in SQL Server 2016.
|
||||
--SKIPIF--
|
||||
<?php require('skipif.inc'); ?>
|
||||
<?php require('skipif_azure.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
require_once 'MsCommon.inc';
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
--TEST--
|
||||
Test connection keywords for Azure Key Vault for Always Encrypted.
|
||||
--SKIPIF--
|
||||
<?php require('skipif_mid-refactor.inc'); ?>
|
||||
<?php require('skipif_azure.inc');
|
||||
require('skipif_mid-refactor.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
require_once('pdo_ae_azure_key_vault_common.php');
|
||||
|
|
|
@ -449,6 +449,10 @@ function handleErrors()
|
|||
|
||||
function setUSAnsiLocale()
|
||||
{
|
||||
// Do not run locale tests in Azure
|
||||
if (isDaasMode()) {
|
||||
return;
|
||||
}
|
||||
if (!isWindows()) {
|
||||
// macOS the locale names are different in Linux or macOS
|
||||
$locale = strtoupper(PHP_OS) === 'LINUX' ? "en_US.ISO-8859-1" : "en_US.ISO8859-1";
|
||||
|
@ -459,6 +463,10 @@ function setUSAnsiLocale()
|
|||
|
||||
function resetLocaleToDefault()
|
||||
{
|
||||
// Do not run locale tests in Azure
|
||||
if (isDaasMode()) {
|
||||
return;
|
||||
}
|
||||
// Like setUSAnsiLocale() above, this method is only needed in non-Windows environment
|
||||
if (!isWindows()) {
|
||||
setlocale(LC_ALL, null);
|
||||
|
@ -472,6 +480,10 @@ function isLocaleSupported()
|
|||
if (isWindows()) {
|
||||
return true;
|
||||
}
|
||||
// Do not run locale tests in Azure
|
||||
if (isDaasMode()) {
|
||||
return false;
|
||||
}
|
||||
if (AE\isDataEncrypted()) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -6,7 +6,8 @@ emalloc (which only allocate memory in the memory space allocated for the PHP pr
|
|||
--ENV--
|
||||
PHPT_EXEC=true
|
||||
--SKIPIF--
|
||||
<?php require('skipif_versions_old.inc'); ?>
|
||||
<?php require('skipif_azure.inc');
|
||||
require('skipif_versions_old.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
require_once('MsCommon.inc');
|
||||
|
|
|
@ -4,7 +4,7 @@ verify github issue52 is fixed.
|
|||
This test only works in previous versions of SQL Servers. Full-text search features are
|
||||
deprecated starting in SQL Server 2016.
|
||||
--SKIPIF--
|
||||
<?php require('skipif.inc'); ?>
|
||||
<?php require('skipif_azure.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
--TEST--
|
||||
Test connection keywords for Azure Key Vault for Always Encrypted.
|
||||
--SKIPIF--
|
||||
<?php require('skipif_versions_old.inc'); ?>
|
||||
<?php require('skipif_azure.inc');
|
||||
require('skipif_versions_old.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
require_once('sqlsrv_ae_azure_key_vault_common.php');
|
||||
|
|
|
@ -70,7 +70,7 @@ $azurePassword = $adPassword;
|
|||
if ($azureServer != 'TARGET_AD_SERVER')
|
||||
{
|
||||
$connectionInfo = array( "UID"=>$azureUsername, "PWD"=>$azurePassword,
|
||||
"Authentication"=>'ActiveDirectoryPassword', "TrustServerCertificate"=>true );
|
||||
"Authentication"=>'ActiveDirectoryPassword', "TrustServerCertificate"=>false );
|
||||
|
||||
$conn = sqlsrv_connect( $azureServer, $connectionInfo );
|
||||
if( $conn === false )
|
||||
|
|
Загрузка…
Ссылка в новой задаче