Skip to content

Fixing bugs of powershell tests and saving recordings except e2e. #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2015
Merged

Fixing bugs of powershell tests and saving recordings except e2e. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="ResourceName" value="backuprn1" />
<add key="ResourceName" value="backuprn" />
<add key="ResourceGroupName" value="backuprg" />
<add key="ResourceId" value="7368183945769329045" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
Expand Down
82 changes: 75 additions & 7 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,22 +165,90 @@
<None Include="ScenarioTests\AzureBackupContainerTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupItemTestCases.ps1" />
<None Include="ScenarioTests\AzureBackupJobTests.ps1" />
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1" />
<None Include="ScenarioTests\AzureBackupScenarioTests.ps1" />
<None Include="ScenarioTests\AzureBackupItemTestCases.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupJobTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupScenarioTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupVaultTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\BackupItemTests.ps1" />
<None Include="ScenarioTests\RecoveryPointTests.ps1" />
<None Include="ScenarioTests\RestoreItemTests.ps1" />
<None Include="ScenarioTests\BackupItemTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\RecoveryPointTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\RestoreItemTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupContainerScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupMarsContainerScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupRegisterContainerScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\AzureBackupUnregisterContainerScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\DisableAzureBackupProtectionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\EnableAzureBackupProtectionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases\ListAzureBackupItemTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests\GetAzureRMBackupJobTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests\StopAzureRMBackupJobTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\ListProtectionPolicyByNameTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\ListProtectionPolicyTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\NewProtectionPolicyTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\RemoveProtectionPolicyTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\SetProtectionPolicyTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupScenarioTests\AzureBackupEndToEndTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests\AzureBackupVaultScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.BackupItemTests\BackUpAzureBackUpItem.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RecoveryPointTests\GetRecoveryPointsTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RecoveryPointTests\GetRecoveryPointTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.RestoreItemTests\RestoreAzureBackUpItem.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
6 changes: 3 additions & 3 deletions ...Manager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
# ----------------------------------------------------------------------------------

$ResourceGroupName = "backuprg"
$ResourceName = "backuprn1"
$ResourceName = "backuprn"
$ContainerName = "DPMDRSCALEINT1.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM"
$ContainerType = "Windows"
$ContainerId = "10034"
$ContainerId = "213698"
$ContainerStatus = "Registered"

function Test-AzureBackupMarsContainerScenario
Expand Down Expand Up @@ -67,7 +67,7 @@ function Test-RegisterAzureBackupContainer

function Test-UnregisterAzureBackupContainer
{
$vault = Get-AzureRMBackupVault -$VaultResourceRGName mkheranirg -Name $VaultResourceName
$vault = Get-AzureRMBackupVault -Name $VaultResourceName
$container = Get-AzureRMBackupContainer -Name $IaasVMManagedResourceName -Type AzureVM -ManagedResourceGroupName $IaasVMManagedResourceGroupName -Vault $vault
$jobId = Unregister-AzureRMBackupContainer -Container $container

Expand Down
31 changes: 13 additions & 18 deletions ...eManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupItemTestCases.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
$ResourceName = "backuprn"
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$ContainerType = "IaasVMContainer"
$DataSourceType = "VM"
$DataSourceType = "IaasVM"
$DataSourceId = "17593283453810"
$Location = "SouthEast Asia"
$PolicyName = "Policy9";
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$PolicyName = "ProtPolicy01";
$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/protectionPolicies/DefaultPolicy";
$POName = "hydrarecordvm"
$itemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"


function Test-GetAzureBackupItemTests
{
$azureBackUpContainer = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupContainer
$azureBackUpContainer = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupContainer
$azureBackUpContainer.ResourceGroupName = $ResourceGroupName
$azureBackUpContainer.ResourceName = $ResourceName
$azureBackUpContainer.Location = $Location
Expand All @@ -37,39 +38,33 @@ function Test-GetAzureBackupItemTests

function Test-EnableAzureBackupProtection
{
$policy = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupProtectionPolicy
$policy.InstanceId = $PolicyId
$policy.Name = $PolicyName
$policy.ResourceGroupName = $ResourceGroupName
$policy.ResourceName = $ResourceName
$policy.Location = $Location
$policy.WorkloadType = "VM"
$policy.RetentionType = "1"
$policy.ScheduleRunTimes = "2015-06-13T20:30:00"
$vault = Get-AzureRMBackupVault -Name $ResourceName
$policyList = Get-AzureRMBackupProtectionPolicy -Vault $vault
$policy = $policyList[0]

$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
$azureBackUpItem.ResourceName = $ResourceName
$azureBackUpItem.Location = $Location
$azureBackUpItem.ContainerUniqueName = $ContainerName
$azureBackUpItem.ContainerType = $ContainerType
$azureBackUpItem.DataSourceId = $DataSourceId
$azureBackUpItem.Type = $DataSourceType
$azureBackUpItem.Name = $POName
$azureBackUpItem.ItemName = $itemName
$jobId = Enable-AzureRMBackupProtection -Item $azureBackUpItem -Policy $policy

}

function Test-DisableAzureBackupProtection
{
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
$azureBackUpItem.ResourceName = $ResourceName
$azureBackUpItem.Location = $Location
$azureBackUpItem.ContainerUniqueName = $ContainerName
$azureBackUpItem.ContainerType = $ContainerType
$azureBackUpItem.DataSourceId = $DataSourceId
$azureBackUpItem.Type = $DataSourceType
$azureBackUpItem.ItemName = $itemName
$azureBackUpItem.Name = $POName
$jobId1 = Disable-AzureRMBackupProtection -Item $azureBackUpItem
}
2 changes: 1 addition & 1 deletion ...esourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupJobTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
{
public class AzureRMBackupJobTests : AzureBackupTestsBase
public class AzureBackupJobTests : AzureBackupTestsBase
{

[Fact]
Expand Down
30 changes: 13 additions & 17 deletions ...sourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupJobTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ $Location = "SouthEast Asia"
$PolicyName = "Policy9";
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$ItemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"

# startTime%20eq%20'2015-07-15%2009:39:29%20AM'%20and%20endTime%20eq%20'2015-08-14%2009:39:29%20AM'",

function Test-GetAzureRMBackupJob
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$OneMonthBack = Get-Date;
$OneMonthBack = $OneMonthBack.AddDays(-30);
$jobs = Get-AzureRMBackupJob -Vault $vault -From $OneMonthBack
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$OneMonthBack = Get-Date -Date "2015-07-15 09:39:29Z";
$now = Get-Date -Date "2015-08-14 09:39:29Z";
$jobs = Get-AzureRMBackupJob -Vault $vault -From $OneMonthBack -To $now
Assert-NotNull $jobs 'Jobs list should not be null'
foreach($job in $jobs)
{
Expand All @@ -41,19 +43,13 @@ function Test-GetAzureRMBackupJob

function Test-StopAzureRMBackupJob
{
$OneMonthBack = Get-Date;
$OneMonthBack = $OneMonthBack.AddDays(-30);

$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
$azureBackUpItem.ResourceName = $ResourceName
$azureBackUpItem.Location = $Location
$azureBackUpItem.ContainerUniqueName = $ContainerName
$azureBackUpItem.ContainerType = $ContainerType
$azureBackUpItem.DataSourceId = $DataSourceId
$azureBackUpItem.Type = $DataSourceType

$job = Backup-AzureBackupItem -Item $azureBackUpItem
$AzureRMBackupItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
$AzureRMBackupItem.ResourceGroupName = $ResourceGroupName
$AzureRMBackupItem.ResourceName = $ResourceName
$AzureRMBackupItem.Location = $Location
$AzureRMBackupItem.ContainerUniqueName = $ContainerName
$AzureRMBackupItem.ItemName = $ItemName
$job = Backup-AzureRMBackupItem -Item $AzureRMBackupItem

Stop-AzureRMBackupJob -Job $job;
Wait-AzureRMBackupJob -Job $job;
Expand Down
19 changes: 8 additions & 11 deletions ...rceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $Location = "SouthEast Asia"
$PolicyName = "Policy10";
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$Type = "IaasVM"
$Type = "AzureVM"
$RetentionType = "Days"
$BackupTime = "2015-06-13T20:30:00"
$DaysOfWeek = "Monday"
Expand All @@ -33,12 +33,11 @@ Tests creating new resource group and a simple resource.
#>
function Test-GetAzureBackupProtectionPolicyTests
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$protectionPolicies = Get-AzureRMBackupProtectionPolicy -vault $vault
Assert-NotNull $protectionPolicies 'Protection Policies should not be null'
foreach($protectionPolicy in $protectionPolicies)
{
Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
Expand All @@ -51,10 +50,9 @@ function Test-GetAzureBackupProtectionPolicyTests

function Test-GetAzureBackupProtectionPolicyByNameTests
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName

Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
Expand All @@ -67,14 +65,13 @@ function Test-GetAzureBackupProtectionPolicyByNameTests

function Test-NewAzureBackupProtectionPolicyTests
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$r1 = New-AzureRMBackupRetentionPolicyObject -DailyRetention -Retention 20
$r2 = New-AzureRMBackupRetentionPolicyObject -WeeklyRetention -DaysOfWeek "Monday" -Retention 10
$r = ($r1, $r2)

$protectionPolicy = New-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName -Type $Type -Daily -RetentionPolicies $r -BackupTime $BackupTime
$protectionPolicy = New-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName -Type $Type -Daily -RetentionPolicy $r -BackupTime $BackupTime

Assert-NotNull $protectionPolicy.InstanceId 'InstanceId should not be null'
Assert-NotNull $protectionPolicy.Name 'Name should not be null'
Assert-NotNull $protectionPolicy.Type 'Type should not be null'
Assert-NotNull $protectionPolicy.BackupTime 'BackupTime should not be null'
Expand All @@ -86,16 +83,16 @@ function Test-NewAzureBackupProtectionPolicyTests

function Test-SetAzureBackupProtectionPolicyTests
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
$policyNewName = "policy09_new"
$policyNewName = "policy09-new"

Set-AzureRMBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -NewName $policyNewName
}

function Test-RemoveAzureBackupProtectionPolicyTests
{
$vault = Get-AzureBackupVault -Name $ResourceName;
$vault = Get-AzureRMBackupVault -Name $ResourceName;
$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName

Remove-AzureRMBackupProtectionPolicy -ProtectionPolicy $protectionPolicy
Expand Down
Loading