Merge pull request #6200 from maddieclayton/fixAC

Fix flaky ArgumentCompleter tests

Author: cormacpayne

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

@@ -51,7 +51,23 @@ protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDi
                         {
                             IResourceManagementClient client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             var allProviders = client.Providers.ListAsync();
-                            if (allProviders.Wait(TimeSpan.FromSeconds(_timeout)))
+                            if (_timeout == -1)
+                            {
+                                allProviders.Wait();
+                                if (allProviders.Result != null)
+                                {
+                                    _resourceTypeLocationDictionary[contextHash] = CreateLocationDictionary(allProviders.Result.ToList());
+                                    output = _resourceTypeLocationDictionary[contextHash];
+                                }
+                                else
+                                {
+                                    output = CreateLocationDictionary(new List<Provider>());
+#if DEBUG
+                                    throw new InvalidOperationException("Result from client.Providers is null");
+#endif
+                                }
+                            }
+                            else if (allProviders.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
                                 if (allProviders.Result != null)
                                 {

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

@@ -51,7 +51,17 @@ protected static IList<String> ResourceGroupNames
                             var client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             // Retrieve only the first page of ResourceGroups to display to the user
                             var resourceGroups = client.ResourceGroups.ListAsync();
-                            if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
+
+                            if (_timeout == -1)
+                            {
+                                resourceGroups.Wait();
+                                tempResourceGroupList = CreateResourceGroupList(resourceGroups.Result);
+                                if (resourceGroups.Result != null)
+                                {
+                                    _resourceGroupNamesDictionary[contextHash] = tempResourceGroupList;
+                                }
+                            }
+                            else if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
                                 tempResourceGroupList = CreateResourceGroupList(resourceGroups.Result);
                                 if (resourceGroups.Result != null)

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

@@ -58,7 +58,14 @@ protected static IList<String> ResourceTypes
                                 while (!string.IsNullOrEmpty(page.NextPageLink))
                                 {
                                     task = client.Providers.ListNextAsync(page.NextPageLink);
-                                    if (task.Wait(TimeSpan.FromSeconds(_timeout)))
+
+                                    if (_timeout == -1)
+                                    {
+                                        task.Wait();
+                                        page = task.Result;
+                                        resourceTypes.AddRange(page);
+                                    }
+                                    else if (task.Wait(TimeSpan.FromSeconds(_timeout)))
                                     {
                                         page = task.Result;
                                         resourceTypes.AddRange(page);

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

@@ -48,7 +48,14 @@ protected static IList<String> Scopes
                             var client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             // Retrieve only the first page of ResourceGroups to use for scopes
                             var resourceGroups = client.ResourceGroups.ListAsync();
-                            if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
+
+                            if (_timeout == -1)
+                            {
+                                resourceGroups.Wait();
+                                tempScopeList = CreateScopeList(resourceGroups.Result, context.Subscription.Id);
+                                _scopeDictionary[contextHash] = tempScopeList;
+                            }
+                            else if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
                                 tempScopeList = CreateScopeList(resourceGroups.Result, context.Subscription.Id);
                                 _scopeDictionary[contextHash] = tempScopeList;

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

@@ -36,14 +36,14 @@ public ArgumentCompleterTests(ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.Flaky)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestLocationCompleter()
         {
             ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-LocationCompleter");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.Flaky)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResourceGroupCompleter()
         {
             ProfileController.NewInstance.RunPsTest(xunitLogger, "72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-ResourceGroupCompleter");

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, 60)
+	$locations = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.LocationCompleterAttribute]::FindLocations($resourceTypes, -1)
 	$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(60)
+	$resourceGroups = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceGroupCompleterAttribute]::GetResourceGroups(-1)
 	$expectResourceGroups = Get-AzureRmResourceGroup | ForEach-Object {$_.ResourceGroupName}
 	Assert-AreEqualArray $resourceGroups $expectResourceGroups
 }