Skip to content

Commit 7888296

Browse files
authored
Merge pull request #678 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents e9030f0 + 1cb5dda commit 7888296

File tree

5 files changed

+921
-11
lines changed

5 files changed

+921
-11
lines changed

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@
485485
</None>
486486
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestDatatabaseAuditingTypeMigration.json">
487487
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
488+
</None>
489+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestGetServerAndDatabaseAuditingInUkRegion.json">
490+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
488491
</None>
489492
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestServerAuditingTypeMigration.json">
490493
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,18 @@ public void TestServerAuditingTypeMigration()
242242
RunPowerShellTest("Test-ServerAuditingTypeMigration");
243243
}
244244

245-
[Fact (Skip = "Waiting backend validation")]
245+
[Fact(Skip = "Waiting backend validation")]
246246
[Trait(Category.AcceptanceType, Category.CheckIn)]
247247
public void TestAuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion()
248248
{
249249
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");
250250
}
251+
252+
[Fact]
253+
[Trait(Category.AcceptanceType, Category.CheckIn)]
254+
public void TestGetServerAndDatabaseAuditingInUkRegion()
255+
{
256+
RunPowerShellTest("Test-GetServerAndDatabaseAuditingInUkRegion");
257+
}
251258
}
252259
}

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,3 +1098,37 @@ function Test-ServerAuditingTypeMigration
10981098
Remove-TestEnvironment $testSuffix
10991099
}
11001100
}
1101+
1102+
<#
1103+
.SYNOPSIS
1104+
Tests that Get Server and Database Auditing on UK passes
1105+
#>
1106+
function Test-GetServerAndDatabaseAuditingInUkRegion
1107+
{
1108+
# Setup
1109+
$testSuffix = 684412
1110+
Create-TestEnvironment $testSuffix "UK South"
1111+
$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
1112+
1113+
try
1114+
{
1115+
# Test
1116+
$policy = Get-AzureRmSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
1117+
1118+
# Assert
1119+
Assert-AreEqual $policy.AuditState "Disabled"
1120+
Assert-AreEqual $policy.RetentionInDays 0
1121+
1122+
# Test
1123+
$policy = Get-AzureRmSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
1124+
1125+
# Assert
1126+
Assert-AreEqual $policy.AuditState "Disabled"
1127+
Assert-AreEqual $policy.RetentionInDays 0
1128+
}
1129+
finally
1130+
{
1131+
# Cleanup
1132+
Remove-TestEnvironment $testSuffix
1133+
}
1134+
}

0 commit comments

Comments
 (0)