Fixed tests.

Fixed tests

Fixed tests

Author: paterasMSFT

src/Batch/Batch.Test/ScenarioTests/CertificateTests.ps1

@@ -62,8 +62,8 @@ function Test-TestCancelCertificateDelete
     Get-AzBatchCertificate $thumbprintAlgorithm $thumbprint -BatchContext $context | Stop-AzBatchCertificateDeletion -BatchContext $context
 
     # Verify the cert went back to the active state
-    $filter = "state eq 'active'"
+    $filter = "state eq 'active'";
     $cert = Get-AzBatchCertificate -Filter $filter -BatchContext $context
 
-    Assert-AreEqual $thumbprint $cert.Thumbprint.ToLowerInvariant()
+    Assert-True { $cert.Thumbprint.ToLowerInvariant() -Contains $thumbprint }
 }

src/Batch/Batch.Test/ScenarioTests/JobTests.ps1

@@ -114,7 +114,7 @@ function Test-JobWithTaskDependencies
 
         $poolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolSpecification
         $poolSpec.TargetDedicated = $targetDedicated = 3
-        $poolSpec.VirtualMachineSize = $vmSize = "small"
+        $poolSpec.VirtualMachineSize = $vmSize = "standard_d1_v2"
         $poolSpec.CloudServiceConfiguration = $paasConfiguration
         $autoPoolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoPoolSpecification
         $autoPoolSpec.PoolSpecification = $poolSpec
@@ -162,8 +162,8 @@ function IfJobSetsAutoFailure-ItCompletesWhenAnyTaskFails
     $paasConfiguration = New-Object Microsoft.Azure.Commands.Batch.Models.PSCloudServiceConfiguration -ArgumentList @($osFamily, $targetOSVersion)
 
     $poolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolSpecification
-    $poolSpec.TargetDedicatedComputeNodes = $targetDedicated = 3
-    $poolSpec.VirtualMachineSize = $vmSize = "small"
+    $poolSpec.TargetDedicatedComputeNodes = $targetDedicated = 1
+    $poolSpec.VirtualMachineSize = $vmSize = "standard_d1_v2"
     $poolSpec.CloudServiceConfiguration = $paasConfiguration
     $autoPoolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoPoolSpecification
     $autoPoolSpec.PoolSpecification = $poolSpec

src/Batch/Batch.Test/ScenarioTests/ScenarioTestHelpers.cs

@@ -209,7 +209,7 @@ public static void CreateTestPool(
 
             NewPoolParameters parameters = new NewPoolParameters(context, poolId)
             {
-                VirtualMachineSize = "small",
+                VirtualMachineSize = "standard_d1_v2",
                 CloudServiceConfiguration = paasConfiguration,
                 TargetDedicatedComputeNodes = targetDedicated,
                 TargetLowPriorityComputeNodes = targetLowPriority,
@@ -441,7 +441,7 @@ public static PSCloudJob WaitForJobCompletion(BatchController controller, BatchA
 
             DateTime timeout = DateTime.Now.AddMinutes(10);
 
-            while (job.State != JobState.Completed || DateTime.Now > timeout)
+            while (job.State != JobState.Completed && DateTime.Now < timeout)
             {
                 job = client.ListJobs(new ListJobOptions(context)).First(cloudJob => cloudJob.Id == jobId);