From 6e8111418d6fdfd5d87ad0f1bb704232608495e6 Mon Sep 17 00:00:00 2001
From: yitam <v-yitam@microsoft.com>
Date: Tue, 27 Jun 2017 14:20:53 -0700
Subject: [PATCH] resiliency tests and skip azure condition

---
 test/functional/pdo_sqlsrv/break_pdo.php    | 6 ++++--
 test/functional/pdo_sqlsrv/skipif_azure.inc | 8 +++-----
 test/functional/sqlsrv/break.php            | 6 ++++--
 test/functional/sqlsrv/skipif_azure.inc     | 6 ++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/break_pdo.php b/test/functional/pdo_sqlsrv/break_pdo.php
index b066ff6c..0be99e6f 100644
--- a/test/functional/pdo_sqlsrv/break_pdo.php
+++ b/test/functional/pdo_sqlsrv/break_pdo.php
@@ -65,8 +65,10 @@ function BreakConnection( $conn, $conn_break )
 }
 
 // Remove any databases previously created by GenerateDatabase
-function DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 )
+function DropTables( $server, $uid, $pwd, $tableName1, $tableName2 )
 {
+    global $dbName;
+
     $conn = new PDO( "sqlsrv:server = $server ; Database = $dbName ;", $uid, $pwd );
     
     $query="IF OBJECT_ID('$tableName1', 'U') IS NOT NULL DROP TABLE $tableName1";
@@ -76,7 +78,7 @@ function DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 )
     $stmt=$conn->query( $query );
 }
 
-DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 );
+DropTables( $server, $uid, $pwd, $tableName1, $tableName2 );
 GenerateTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 );
 
 ?>
diff --git a/test/functional/pdo_sqlsrv/skipif_azure.inc b/test/functional/pdo_sqlsrv/skipif_azure.inc
index 38de106d..aec21ea5 100644
--- a/test/functional/pdo_sqlsrv/skipif_azure.inc
+++ b/test/functional/pdo_sqlsrv/skipif_azure.inc
@@ -2,9 +2,7 @@
 if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv'))
     die("PDO driver cannot be loaded; skipping test.\n");
     
-include 'MsCommon.inc';
-if ( IsDaasMode() ) {
-    die("test not applicable in Azure");
-}
-    
+require 'MsSetup.inc';
+if ($daasMode) die("skip test not applicable in Azure\n");
+   
 ?>
diff --git a/test/functional/sqlsrv/break.php b/test/functional/sqlsrv/break.php
index 671dc48e..97abcccf 100644
--- a/test/functional/sqlsrv/break.php
+++ b/test/functional/sqlsrv/break.php
@@ -70,8 +70,10 @@ function BreakConnection( $conn, $conn_break )
 }
 
 // Remove the tables generated by GenerateTables
-function DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 )
+function DropTables( $server, $uid, $pwd, $tableName1, $tableName2 )
 {
+    global $dbName;
+    
     $connectionInfo = array( "Database"=>$dbName, "UID"=>$uid, "PWD"=>$pwd );
     $conn = sqlsrv_connect( $server, $connectionInfo );
 
@@ -82,7 +84,7 @@ function DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 )
     $stmt=sqlsrv_query( $conn, $query );
 }
 
-DropTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 );
+DropTables( $server, $uid, $pwd, $tableName1, $tableName2 );
 GenerateTables( $server, $uid, $pwd, $dbName, $tableName1, $tableName2 );
 
 ?>
diff --git a/test/functional/sqlsrv/skipif_azure.inc b/test/functional/sqlsrv/skipif_azure.inc
index 1e6bdb6c..81c557a1 100644
--- a/test/functional/sqlsrv/skipif_azure.inc
+++ b/test/functional/sqlsrv/skipif_azure.inc
@@ -4,9 +4,7 @@ if (!extension_loaded("sqlsrv")) {
     die("skip extension not loaded");
 }
 
-include 'MsCommon.inc';
-if ( IsDaasMode() ) {
-    die("test not applicable in Azure");
-}
+require 'MsSetup.inc';
+if ($daasMode) die("skip test not applicable in Azure\n");
 
 ?>
\ No newline at end of file