Cleanup Batch MPI tests

Author: jasper-schneider

src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

@@ -665,9 +665,6 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests\TestListAllTasks.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests\TestListSubtasksWithMaxCount.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests\TestListTaskPipeline.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -54,14 +54,8 @@ public static class ScenarioTestHelpers
         internal const string SharedPoolStartTaskStdOut = "startup\\stdout.txt";
         internal const string SharedPoolStartTaskStdOutContent = "hello";
 
-        // MPI requires a special pool configuration. When recording, the Storage environment variables need to be
-        // set so we can upload the MPI installer for use as a start task resource file.
+        // MPI requires a special pool configuration, so a dedicated pool is used.
         internal const string MpiPoolId = "mpiPool";
-        internal const string MpiSetupFileContainer = "mpi";
-        internal const string MpiSetupFileName = "MSMpiSetup.exe";
-        internal const string MpiSetupFileLocalPath = "Resources\\MSMpiSetup.exe";
-        internal const string StorageAccountEnvVar = "AZURE_STORAGE_ACCOUNT";
-        internal const string StorageKeyEnvVar = "AZURE_STORAGE_ACCESS_KEY";
 
         internal const string BatchAccountName = "AZURE_BATCH_ACCOUNT";
         internal const string BatchAccountKey = "AZURE_BATCH_ACCESS_KEY";
@@ -229,27 +223,17 @@ public static void CreateMpiPoolIfNotExists(BatchController controller, BatchAcc
                 client.ListPools(listOptions);
                 return; // The call returned without throwing an exception, so the pool exists
             }
-            catch (AggregateException aex)
+            catch (BatchException ex)
             {
-                BatchException innerException = aex.InnerException as BatchException;
-                if (innerException == null || innerException.RequestInformation == null || innerException.RequestInformation.BatchError == null ||
-                    innerException.RequestInformation.BatchError.Code != BatchErrorCodeStrings.PoolNotFound)
+                if (ex.RequestInformation == null || ex.RequestInformation.BatchError == null ||
+                    ex.RequestInformation.BatchError.Code != BatchErrorCodeStrings.PoolNotFound)
                 {
                     throw;
                 }
                 // We got the pool not found error, so continue and create the pool
             }
 
-            string blobUrl = UploadBlobAndGetUrl(MpiSetupFileContainer, MpiSetupFileName, MpiSetupFileLocalPath);
-
-            StartTask startTask = new StartTask();
-            startTask.CommandLine = string.Format("cmd /c set & {0} -unattend -force", MpiSetupFileName);
-            startTask.ResourceFiles = new List<ResourceFile>();
-            startTask.ResourceFiles.Add(new ResourceFile(blobUrl, MpiSetupFileName));
-            startTask.RunElevated = true;
-            startTask.WaitForSuccess = true;
-
-            CreateTestPool(controller, context, MpiPoolId, targetDedicated, startTask: startTask);
+            CreateTestPool(controller, context, MpiPoolId, targetDedicated);
         }
 
 
@@ -602,43 +586,6 @@ public static void DeleteComputeNodeUser(BatchController controller, BatchAccoun
             client.DeleteComputeNodeUser(parameters);
         }
 
-        /// <summary>
-        /// Uploads a blob to Storage if it doesn't exist and gets the url
-        /// </summary>
-        private static string UploadBlobAndGetUrl(string containerName, string blobName, string localFilePath)
-        {
-            string blobUrl = "https://defaultUrl.blob.core.windows.net/blobName";
-
-            if (HttpMockServer.Mode == HttpRecorderMode.Record)
-            {
-                // Create container and upload blob if they don't exist
-                string storageAccountName = Environment.GetEnvironmentVariable(StorageAccountEnvVar);
-                string storageKey = Environment.GetEnvironmentVariable(StorageKeyEnvVar);
-                StorageCredentials creds = new StorageCredentials(storageAccountName, storageKey);
-                CloudStorageAccount storageAccount = new CloudStorageAccount(creds, true);
-
-                CloudBlobClient blobClient = storageAccount.CreateCloudBlobClient();
-                CloudBlobContainer container = blobClient.GetContainerReference(containerName);
-                container.CreateIfNotExists();
-
-                CloudBlockBlob blob = container.GetBlockBlobReference(blobName);
-                if (!blob.Exists())
-                {
-                    blob.UploadFromFile(localFilePath, System.IO.FileMode.Open);
-                }
-
-                // Get blob url with SAS string
-                SharedAccessBlobPolicy sasPolicy = new SharedAccessBlobPolicy();
-                sasPolicy.Permissions = SharedAccessBlobPermissions.Read;
-                sasPolicy.SharedAccessExpiryTime = DateTime.UtcNow.AddHours(10);
-                string sasString = container.GetSharedAccessSignature(sasPolicy);
-
-                blobUrl = string.Format("{0}/{1}{2}", container.Uri, blobName, sasString);
-            }
-
-            return blobUrl;
-        }
-
         /// <summary>
         /// Uploads an application package to Storage
         /// </summary>

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

@@ -324,33 +324,6 @@ public void TestTerminateTask()
                 TestUtilities.GetCurrentMethodName());
         }
 
-        [Fact]
-        public void TestListSubtasksWithMaxCount()
-        {
-            BatchController controller = BatchController.NewInstance;
-            string jobId = "maxCountSubtaskJob";
-            string taskId = "testTask";
-            int numInstances = 3;
-            int maxCount = 1;
-            BatchAccountContext context = null;
-            controller.RunPsTestWorkflow(
-                () => { return new string[] { string.Format("Test-ListSubtasksWithMaxCount '{0}' '{1}' '{2}'", jobId, taskId, maxCount) }; },
-                () =>
-                {
-                    context = new ScenarioTestContext();
-                    ScenarioTestHelpers.CreateMpiPoolIfNotExists(controller, context);
-                    ScenarioTestHelpers.CreateTestJob(controller, context, jobId, ScenarioTestHelpers.MpiPoolId);
-                    ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId, "cmd /c hostname", numInstances);
-                    ScenarioTestHelpers.WaitForTaskCompletion(controller, context, jobId, taskId);
-                },
-                () =>
-                {
-                    ScenarioTestHelpers.DeleteJob(controller, context, jobId);
-                },
-                TestUtilities.GetCallingClass(),
-                TestUtilities.GetCurrentMethodName());
-        }
-
         [Fact]
         public void TestListAllSubtasks()
         {

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

@@ -396,26 +396,6 @@ function Test-TerminateTask
     }
 }
 
-<#
-.SYNOPSIS
-Tests querying for Batch subtasks and supplying a max count
-#>
-function Test-ListSubtasksWithMaxCount
-{
-    param([string]$jobId, [string]$taskId, [string]$maxCount)
-
-    $context = New-Object Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ScenarioTestContext
-    $subtasks = Get-AzureBatchSubtask $jobId $taskId -MaxCount $maxCount -BatchContext $context
-
-    Assert-AreEqual $maxCount $subtasks.Length
-
-    # Verify parent object parameter set also works
-    $task = Get-AzureBatchTask $jobId $taskId -BatchContext $context
-    $subtasks = $task | Get-AzureBatchSubtask -MaxCount $maxCount -BatchContext $context
-
-    Assert-AreEqual $maxCount $subtasks.Length
-}
-
 <#
 .SYNOPSIS
 Tests querying for all subtasks under a task