Re-record Batch scenario tests with new API version

Some small changes to improve test robustness.

Author: jasper-schneider

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.ps1

@@ -142,8 +142,8 @@ function Test-GetBatchAccountsUnderResourceGroups
 	$account12 = Get-BatchAccountName
 	$account21 = Get-BatchAccountName
     $location1 = Get-BatchAccountProviderLocation
-	$location2 = Get-BatchAccountProviderLocation 1
-	$location3 = Get-BatchAccountProviderLocation 2
+	$location2 = Get-BatchAccountProviderLocation 4
+	$location3 = Get-BatchAccountProviderLocation 7
 
     try 
     {
@@ -183,7 +183,7 @@ function Test-CreateAndRemoveBatchAccountViaPiping
 	$account2 = Get-BatchAccountName
     $resourceGroup = Get-ResourceGroupName
     $location1 = Get-BatchAccountProviderLocation
-	$location2 = Get-BatchAccountProviderLocation 1 
+	$location2 = Get-BatchAccountProviderLocation 4 
 
 	try
 	{

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

@@ -63,14 +63,14 @@ public void TestGetJobById()
         public void TestListJobsByFilter()
         {
             BatchController controller = BatchController.NewInstance;
-            string jobId1 = "testId1";
-            string jobId2 = "testId2";
+            string jobId1 = "filterTestId1";
+            string jobId2 = "filterTestId2";
             string jobId3 = "thirdtestId";
-            string state = "active";
+            string prefix = "filterTest";
             int matches = 2;
             BatchAccountContext context = null;
             controller.RunPsTestWorkflow(
-                () => { return new string[] { string.Format("Test-ListJobsByFilter '{0}' '{1}' '{2}'", accountName, state.ToString(), matches) }; },
+                () => { return new string[] { string.Format("Test-ListJobsByFilter '{0}' '{1}' '{2}'", accountName, prefix, matches) }; },
                 () =>
                 {
                     context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, accountName);

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1

@@ -252,17 +252,17 @@ Tests querying for Batch jobs using a filter
 #>
 function Test-ListJobsByFilter
 {
-	param([string]$accountName, [string]$state, [string]$matches)
+	param([string]$accountName, [string]$prefix, [string]$matches)
 
 	$context = Get-AzureRmBatchAccountKeys -Name $accountName
-	$filter = "state eq'" + "$state" + "'"
+	$filter = "startswith(id,'$prefix')"
 
 	$jobs = Get-AzureBatchJob_ST -Filter $filter -BatchContext $context
 
 	Assert-AreEqual $matches $jobs.Length
 	foreach($job in $jobs)
 	{
-		Assert-True { $job.Id.StartsWith("$idPrefix") }
+		Assert-True { $job.Id.StartsWith("$prefix") }
 	}
 }
 
@@ -441,8 +441,8 @@ function Test-DeleteJob
 	$context = Get-AzureRmBatchAccountKeys -Name $accountName
 
 	# Verify the job exists
-	$jobs = Get-AzureBatchJob_ST -BatchContext $context
-	Assert-AreEqual 1 $jobs.Count
+	$job = Get-AzureBatchJob_ST $jobId -BatchContext $context
+	Assert-AreNotEqual $null $job
 
 	if ($usePipeline -eq '1')
 	{
@@ -454,7 +454,7 @@ function Test-DeleteJob
 	}
 
 	# Verify the job was deleted
-	$jobs = Get-AzureBatchJob_ST -BatchContext $context
+	$jobs = Get-AzureBatchJob_ST -Filter "id eq '$jobId'" -BatchContext $context
 	Assert-True { $jobs -eq $null -or $jobs[0].State.ToString().ToLower() -eq 'deleting' }
 }
 
@@ -476,7 +476,7 @@ function Test-DisableAndEnableJob
 
 	# Verify the job was Disabled
 	$job = Get-AzureBatchJob_ST $jobId -BatchContext $context
-	Assert-AreEqual 'Disabled' $job.State
+	Assert-True { ($job.State.ToString().ToLower() -eq 'disabled') -or ($job.State.ToString().ToLower() -eq 'disabling') }
 
 	Enable-AzureBatchJob_ST $jobId -BatchContext $context
 
@@ -487,7 +487,7 @@ function Test-DisableAndEnableJob
 	# Verify using the pipeline
 	$job | Disable-AzureBatchJob_ST -DisableJobOption Terminate -BatchContext $context
 	$job = Get-AzureBatchJob_ST $jobId -BatchContext $context
-	Assert-AreEqual 'Disabled' $job.State
+	Assert-True { ($job.State.ToString().ToLower() -eq 'disabled') -or ($job.State.ToString().ToLower() -eq 'disabling') }
 
 	$job | Enable-AzureBatchJob_ST -BatchContext $context
 	$job = Get-AzureBatchJob_ST -Filter "id eq '$jobId'" -BatchContext $context

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs

@@ -28,6 +28,9 @@ public class PoolTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
         private const string commonAccountName = ScenarioTestHelpers.SharedAccount;
         private const string testPoolId = ScenarioTestHelpers.SharedPool;
 
+        // Get from WATaskOSFamilyVersions table, which lags behind https://azure.microsoft.com/en-us/documentation/articles/cloud-services-guestos-update-matrix/
+        private const string specificOSVersion = "WA-GUEST-OS-4.22_201507-01"; 
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewPool()
@@ -443,7 +446,7 @@ private void TestChangeOSVersion(bool usePipeline)
                 {
                     context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, commonAccountName);
                     string currentTargetOSVersion = ScenarioTestHelpers.WaitForOSVersionChange(controller, context, testPoolId);
-                    newTargetOSVersion = currentTargetOSVersion == "*" ? "WA-GUEST-OS-4.20_201505-01" : "*";
+                    newTargetOSVersion = currentTargetOSVersion == "*" ? specificOSVersion : "*";
                 },
                 null,
                 TestUtilities.GetCallingClass(),

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs

@@ -93,6 +93,43 @@ public static string AddTestCertificate(BatchController controller, BatchAccount
             BatchClient client = new BatchClient(controller.BatchManagementClient, controller.ResourceManagementClient);
 
             X509Certificate2 cert = new X509Certificate2(filePath);
+            ListCertificateOptions getParameters = new ListCertificateOptions(context, behaviors) 
+            { 
+                ThumbprintAlgorithm = BatchTestHelpers.TestCertificateAlgorithm, 
+                Thumbprint = cert.Thumbprint,
+                Select = "thumbprint,state"
+            };
+
+            try
+            {
+                PSCertificate existingCert = client.ListCertificates(getParameters).FirstOrDefault();
+                DateTime start = DateTime.Now;
+                DateTime end = start.AddMinutes(5);
+
+                // Cert might still be deleting from other tests, so we wait for the delete to finish.
+                while (existingCert != null && existingCert.State == CertificateState.Deleting)
+                {
+                    if (DateTime.Now > end)
+                    {
+                        throw new TimeoutException("Timed out waiting for existing cert to be deleted.");
+                    }
+                    Sleep(5000);
+                    existingCert = client.ListCertificates(getParameters).FirstOrDefault();
+                }
+            }
+            catch (AggregateException ex)
+            {
+                foreach (Exception inner in ex.InnerExceptions)
+                {
+                    BatchException batchEx = inner as BatchException;
+                    // When the cert doesn't exist, we get a 404 error. For all other errors, throw.
+                    if (batchEx == null || !batchEx.Message.Contains("CertificateNotFound"))
+                    {
+                        throw;
+                    }
+                }
+            }
+
             NewCertificateParameters parameters = new NewCertificateParameters(context, null, cert.RawData, behaviors);
 
             client.AddCertificate(parameters);

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs

@@ -301,8 +301,9 @@ public void TestTerminateTask()
                 {
                     context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, accountName);
                     ScenarioTestHelpers.CreateTestJob(controller, context, jobId);
-                    ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId1);
-                    ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId2);
+                    // Make the tasks long running so they can be terminated before they finish execution
+                    ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId1, "ping -t localhost -w 60");
+                    ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId2, "ping -t localhost -w 60");
                 },
                 () =>
                 {

src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests/TestBatchAccountKeys.json

@@ -25,16 +25,16 @@
           "no-cache"
         ],
         "x-ms-ratelimit-remaining-subscription-reads": [
-          "14951"
+          "14996"
         ],
         "x-ms-request-id": [
-          "48f50f6a-d361-43c9-b451-d9494b8ed4ea"
+          "7e87fd7c-acf1-460f-a797-152e92f93c32"
         ],
         "x-ms-correlation-request-id": [
-          "48f50f6a-d361-43c9-b451-d9494b8ed4ea"
+          "7e87fd7c-acf1-460f-a797-152e92f93c32"
         ],
         "x-ms-routing-request-id": [
-          "WESTUS:20150709T190213Z:48f50f6a-d361-43c9-b451-d9494b8ed4ea"
+          "WESTUS:20151026T231649Z:7e87fd7c-acf1-460f-a797-152e92f93c32"
         ],
         "Strict-Transport-Security": [
           "max-age=31536000; includeSubDomains"
@@ -43,7 +43,7 @@
           "no-cache"
         ],
         "Date": [
-          "Thu, 09 Jul 2015 19:02:12 GMT"
+          "Mon, 26 Oct 2015 23:16:48 GMT"
         ]
       },
       "StatusCode": 200