Merge pull request #2866 from hyonholee/dev

Compute help file update and test fix

Author: cormacpayne

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/RunnerTests.cs

@@ -25,28 +25,6 @@ public void ExecuteRunnerTests()
                 return;
             }
 
-            Assert.False(string.IsNullOrEmpty(csmAuth));
-            Assert.True(csmAuth.Contains("AADTenant"));
-
-            var envDictionary = TestUtilities.ParseConnectionString(csmAuth);
-            var testEnv = new TestEnvironment(envDictionary);
-            Assert.NotNull(testEnv.Tenant);
-            Assert.NotNull(testEnv.SubscriptionId);
-            Assert.NotNull(testEnv.ClientId);
-            Assert.True(envDictionary.ContainsKey("ApplicationSecret"));
-
-            var authenticationContext = new AuthenticationContext("https://login.windows.net/" + testEnv.Tenant);
-            var credential = new ClientCredential(testEnv.ClientId, envDictionary["ApplicationSecret"]);
-
-            var result = authenticationContext.AcquireToken("https://management.core.windows.net/", clientCredential: credential);
-
-            Assert.NotNull(result.AccessToken);
-            envDictionary["RawToken"] = result.AccessToken;
-
-            FixCSMAuthEnvVariable(envDictionary);
-
-            Console.WriteLine(Environment.GetEnvironmentVariable("TEST_CSM_ORGID_AUTHENTICATION"));
-
             var testFile = File.ReadAllLines("ScenarioTests\\RunnerTests.csv");
             foreach (var line in testFile)
             {

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.cs

@@ -19,6 +19,8 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public partial class VMDynamicTests
     {
+        public VMDynamicTests() { }
+
         public VMDynamicTests(Xunit.Abstractions.ITestOutputHelper output)
         {
             ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.ps1

@@ -14,25 +14,26 @@
 
 function get_all_vm_locations
 {
-	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
-	{
-		$namespace = "Microsoft.Compute" 
-		$type = "virtualMachines" 
-		$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}  
+    if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
+    {
+        $namespace = "Microsoft.Compute"
+        $type = "virtualMachines"
+        $location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
 
-		if ($location -eq $null) 
-		{  
-			$st = Write-Verbose 'Getting all Azure location - End';
-			return @("West US", "East US")
-		} else 
-		{  
-			$st = Write-Verbose 'Getting all Azure location - End';
-			return $location.Locations  
-		}  
-	}
+        if ($location -eq $null)
+        {
+            $st = Write-Verbose 'Getting all Azure location - End';
+            return @("West US", "East US")
+        }
+        else
+        {
+            $st = Write-Verbose 'Getting all Azure location - End';
+            return $location.Locations
+        }
+    }
 
     $st = Write-Verbose 'Getting all Azure location - End';
-	return @("West US", "East US")
+    return @("West US", "East US")
 }
 
 function get_all_standard_vm_sizes
@@ -336,7 +337,14 @@ function Run-VMDynamicTests
             $st = (func_create_and_setup_nic_ids $random_seed) | Out-File -Encoding ASCII -Append -FilePath $generated_file_name -Force;
             $st = $func_create_and_setup_vm_config_object | Out-File -Encoding ASCII -Append -FilePath $generated_file_name -Force;
 
-            $loc_name_str = $locations[$i % $locations.Count];
+            if ($locations.Count -eq 1)
+            {
+                $loc_name_str = $locations
+            }
+            else
+            {
+                $loc_name_str = $locations[$i % $locations.Count];
+            }
 
             if ($target_location -ne $null -and $target_location -ne '')
             {