resiliency tests and skip azure condition

This commit is contained in:
yitam 2017-06-27 14:20:53 -07:00
parent 49ba138797
commit 6e8111418d
4 changed files with 13 additions and 13 deletions

View file

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

View file

@ -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");
?>

View file

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

View file

@ -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");
?>