Skipped some tests when running against Azure (#874)

microsoft · Nov 8, 2018 · 3679b48 · 3679b48
1 parent f4ad2ae
commit 3679b48
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt b/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt
@@ -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';

diff --git a/test/functional/pdo_sqlsrv/issue_52_pdo.phpt b/test/functional/pdo_sqlsrv/issue_52_pdo.phpt
@@ -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';

diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
@@ -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');

diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
@@ -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;
     }

diff --git a/test/functional/sqlsrv/TC81_MemoryCheck.phpt b/test/functional/sqlsrv/TC81_MemoryCheck.phpt
@@ -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');

diff --git a/test/functional/sqlsrv/issue_52.phpt b/test/functional/sqlsrv/issue_52.phpt
@@ -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
 

diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -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');

diff --git a/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt b/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
@@ -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 )