Merge Conflict

Author: pragrawa

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj

@@ -130,7 +130,6 @@
     <Compile Include="ScenarioTests\AzureBackupItemTestCases.cs" />
     <Compile Include="ScenarioTests\AzureBackupJobTests.cs" />
     <Compile Include="ScenarioTests\AzureBackupPolicyTests.cs" />
-    <Compile Include="ScenarioTests\AzureBackupScenarioTests.cs" />
     <Compile Include="ScenarioTests\AzureBackupTestBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScenarioTests\AzureBackupVaultTests.cs">
@@ -172,9 +171,6 @@
     <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>
@@ -229,9 +225,6 @@
     <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>
@@ -248,7 +241,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupScenarioTests\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -259,7 +254,7 @@
     <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupItemTestCases.ps1

@@ -13,16 +13,16 @@
 # ----------------------------------------------------------------------------------
 
 $ResourceGroupName = "backuprg"
-$ResourceName = "backuprn"
-$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
+$ResourceName = "backuprn2"
+$ContainerName = "iaasvmcontainer;powershellbvt1;powershellbvt1"
 $ContainerType = "IaasVMContainer"
 $DataSourceType = "IaasVM"
 $DataSourceId = "17593283453810"
-$Location = "SouthEast Asia"
+$Location = "westus"
 $PolicyName = "ProtPolicy01";
-$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/protectionPolicies/DefaultPolicy";
-$POName = "hydrarecordvm"
-$itemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
+$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn2/protectionPolicies/DefaultPolicy";
+$POName = "powershellbvt1"
+$itemName = "iaasvmcontainer;powershellbvt1;powershellbvt1"
 
 
 function Test-GetAzureBackupItemTests
@@ -80,5 +80,5 @@ function Test-DisableAzureBackupProtection
 	$azureBackUpItem.Type = $DataSourceType
 	$azureBackUpItem.ItemName = $itemName
 	$azureBackUpItem.Name = $POName
-	$jobId1 = Disable-AzureRmBackupProtection -Item $azureBackUpItem
-}
+	$jobId1 = Disable-AzureRmBackupProtection -Item $azureBackUpItem -Force
+}

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1

@@ -13,9 +13,9 @@
 # ----------------------------------------------------------------------------------
 
 $ResourceGroupName = "backuprg"
-$ResourceName = "backuprn"
+$ResourceName = "backuprn2"
 $DataSourceType = "VM"
-$Location = "SouthEast Asia"
+$Location = "westus"
 $PolicyName = "Policy10";
 $PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
 $POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
@@ -92,8 +92,9 @@ function Test-SetAzureBackupProtectionPolicyTests
 
 function Test-RemoveAzureBackupProtectionPolicyTests
 {	
+
 	$vault = Get-AzureRmBackupVault -Name $ResourceName;
 	$protectionPolicy = Get-AzureRmBackupProtectionPolicy -vault $vault -Name $PolicyName
 
-	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy
-}
+	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force
+}