dprevot/php-pdo-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Skipped some tests when running against Azure (#874)

Browse source
This commit is contained in:
Jenny Tam 2018-11-07 16:37:11 -08:00 committed by GitHub
parent f4ad2ae1d4
commit 3679b48df2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt
View file

@ -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';

2
test/functional/pdo_sqlsrv/issue_52_pdo.phpt
View file

@ -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';

3
test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
View file

@ -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');

12
test/functional/sqlsrv/MsCommon.inc
View file

@ -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;
}

3
test/functional/sqlsrv/TC81_MemoryCheck.phpt
View file

@ -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');

2
test/functional/sqlsrv/issue_52.phpt
View file

@ -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

3
test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
View file

@ -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');

2
test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
View file

@ -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 )