Merge pull request Azure#5017 from maddieclayton/fixcomptext1

Make timeout adjustable and rerecord test with longer timeout for completers

Author: maddieclayton

src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/LocationCompleter.cs

@@ -35,6 +35,7 @@ public class LocationCompleterAttribute : PSCompleterBaseAttribute
         private static IDictionary<int, IDictionary<string, ICollection<string>>> _resourceTypeLocationDictionary = new ConcurrentDictionary<int, IDictionary<string, ICollection<string>>>();
         private static readonly object _lock = new object();
         private static string[] _resourceTypes;
+        private static int _timeout = 3;
 
         protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDictionary
         {
@@ -56,7 +57,7 @@ protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDi
                                 instance.ClientFactory.GetCustomHandlers());
                             client.SubscriptionId = context.Subscription.Id;
                             var allProviders = client.Providers.ListAsync();
-                            if (allProviders.Wait(TimeSpan.FromSeconds(3)))
+                            if (allProviders.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
                                 if (allProviders.Result != null)
                                 {
@@ -114,6 +115,12 @@ public override string[] GetCompleterValues()
             return FindLocations(_resourceTypes);
         }
 
+        public static string[] FindLocations(string[] resourceTypes, int timeout)
+        {
+            _timeout = timeout;
+            return FindLocations(resourceTypes);
+        }
+
         public static string[] FindLocations(string[] resourceTypes)
         {
             return FindLocations(resourceTypes, ResourceTypeLocationDictionary);

src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceGroupCompleter.cs

@@ -33,6 +33,7 @@ public class ResourceGroupCompleterAttribute : PSCompleterBaseAttribute
     {
         private static IDictionary<int, IList<String>> _resourceGroupNamesDictionary = new ConcurrentDictionary<int, IList<string>>();
         private static readonly object _lock = new object();
+        public static int _timeout = 3;
 
         protected static IList<String> ResourceGroupNames
         {
@@ -55,7 +56,7 @@ protected static IList<String> ResourceGroupNames
                             client.SubscriptionId = context.Subscription.Id;
                             // Retrieve only the first page of ResourceGroups to display to the user
                             var resourceGroups = client.ResourceGroups.ListAsync();
-                            if (resourceGroups.Wait(TimeSpan.FromSeconds(5)))
+                            if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
                                 tempResourceGroupList = CreateResourceGroupList(resourceGroups.Result);
                                 if (resourceGroups.Result != null)
@@ -104,6 +105,12 @@ public override string[] GetCompleterValues()
             return GetResourceGroups();
         }
 
+        public static string[] GetResourceGroups(int timeout)
+        {
+            _timeout = timeout;
+            return GetResourceGroups();
+        }
+
         public static string[] GetResourceGroups()
         {
             IAzureContext context = AzureRmProfileProvider.Instance.Profile.DefaultContext;

src/ResourceManager/Profile/Commands.Profile.Test/ArgumentCompleterTests.ps1

@@ -21,7 +21,7 @@ function Test-LocationCompleter
 	$filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.Commands.ResourceManager.Common.dll"
 	$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
 	$resourceTypes = @("Microsoft.Batch/operations")
-	$locations = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.LocationCompleterAttribute]::FindLocations($resourceTypes)
+	$locations = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.LocationCompleterAttribute]::FindLocations($resourceTypes, 60)
 	$expectedResourceType = Get-AzureRmResourceProvider -ProviderNamespace "Microsoft.Batch" | Where-Object {$_.ResourceTypes.ResourceTypeName -eq "operations"}
 	$expectedLocations = $expectedResourceType.Locations | ForEach-Object {"`"" + $_ + "`""}
 	Assert-AreEqualArray $locations $expectedLocations
@@ -36,7 +36,7 @@ function Test-ResourceGroupCompleter
 {
 	$filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.Commands.ResourceManager.Common.dll"
 	$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
-	$resourceGroups = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceGroupCompleterAttribute]::GetResourceGroups()
+	$resourceGroups = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceGroupCompleterAttribute]::GetResourceGroups(60)
 	$expectResourceGroups = Get-AzureRmResourceGroup | ForEach-Object {$_.ResourceGroupName}
 	Assert-AreEqualArray $resourceGroups $expectResourceGroups
 }