Added ability for MockClientFactory to update the timeout properties of Hyak clients that are generated as-needed instead of precreated. Removed LegacySqlClient precreation from scenario tests. Changed hard-coded sleeps to TestMockSupport.Delay.

MiYanni · MiYanni · commit e4015fb544f5 · 2018-04-23T14:17:08.000-07:00
diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs
@@ -30,6 +30,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -118,6 +119,18 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
                     var realClient = realClientFactory.CreateCustomClient<TClient>(parameters);
                     var newRealClient = realClient.WithHandler(HttpMockServer.CreateInstance());
 
+                    var initialTimeoutPropInfo = typeof(TClient).GetProperty("LongRunningOperationInitialTimeout", BindingFlags.Public | BindingFlags.Instance);
+                    if (initialTimeoutPropInfo != null && initialTimeoutPropInfo.CanWrite)
+                    {
+                        initialTimeoutPropInfo.SetValue(newRealClient, 0, null);
+                    }
+
+                    var retryTimeoutPropInfo = typeof(TClient).GetProperty("LongRunningOperationRetryTimeout", BindingFlags.Public | BindingFlags.Instance);
+                    if (retryTimeoutPropInfo != null && retryTimeoutPropInfo.CanWrite)
+                    {
+                        retryTimeoutPropInfo.SetValue(newRealClient, 0, null);
+                    }
+
                     realClient.Dispose();
                     return newRealClient;
                 }
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingClassicStorageTests.cs
@@ -25,10 +25,9 @@ public class AuditingClassicStorageTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public AuditingClassicStorageTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs
@@ -25,10 +25,9 @@ public class AuditingTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public AuditingTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/BlobAuditingClassicStorageTests.cs
@@ -25,10 +25,9 @@ public class BlobAuditingClassicStorageTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public BlobAuditingClassicStorageTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/BlobAuditingTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/BlobAuditingTests.cs
@@ -25,10 +25,9 @@ public class BlobAuditingTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public BlobAuditingTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs
@@ -25,9 +25,8 @@ public class DataMaskingTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient);
         }
 
         public DataMaskingTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudTests.cs
@@ -29,9 +29,8 @@ protected override void SetupManagementClients(Rest.ClientRuntime.Azure.TestFram
         {
             // Only SqlClient is needed.
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient);
         }
 
         [Fact]
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs
@@ -54,9 +54,8 @@ protected SqlTestsBase(ITestOutputHelper output)
         protected virtual void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient);
         }
 
         protected void RunPowerShellTest(params string[] scripts)
@@ -109,19 +108,6 @@ protected Management.Sql.SqlManagementClient GetSqlClient(RestTestFramework.Mock
             return client;
         }
 
-        protected Management.Sql.LegacySdk.SqlManagementClient GetLegacySqlClient()
-        {
-            Management.Sql.LegacySdk.SqlManagementClient client =
-                TestBase.GetServiceClient<Management.Sql.LegacySdk.SqlManagementClient>(
-                    new CSMTestEnvironmentFactory());
-            if (HttpMockServer.Mode == HttpRecorderMode.Playback)
-            {
-                client.LongRunningOperationInitialTimeout = 0;
-                client.LongRunningOperationRetryTimeout = 0;
-            }
-            return client;
-        }
-
         protected Management.Internal.Resources.ResourceManagementClient GetResourcesClient(RestTestFramework.MockContext context)
         {
             Management.Internal.Resources.ResourceManagementClient client =
@@ -177,14 +163,19 @@ protected GraphRbacManagementClient GetGraphClient(RestTestFramework.MockContext
             return client;
         }
 
-        protected StorageManagementClient GetStorageV2Client()
+        protected StorageManagementClient GetStorageV2Client(RestTestFramework.MockContext context)
         {
-            var client =
-                TestBase.GetServiceClient<StorageManagementClient>(new CSMTestEnvironmentFactory());
+#if NETSTANDARD
+            var client = context.GetServiceClient<StorageManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
+#else
+            var client = TestBase.GetServiceClient<StorageManagementClient>(new CSMTestEnvironmentFactory());
+#endif
 
             if (HttpMockServer.Mode == HttpRecorderMode.Playback)
             {
+#if !NETSTANDARD
                 client.LongRunningOperationInitialTimeout = 0;
+#endif
                 client.LongRunningOperationRetryTimeout = 0;
             }
             return client;
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionClassicStorageTests.cs
@@ -25,11 +25,9 @@ public class ThreatDetectionClassicStorageTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client,
-                newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ThreatDetectionTests.cs
@@ -25,11 +25,9 @@ public class ThreatDetectionTests : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
-            var storageV2Client = GetStorageV2Client();
+            var storageV2Client = GetStorageV2Client(context);
             var newResourcesClient = GetResourcesClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client,
-                newResourcesClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);
         }
 
         public ThreatDetectionTests(ITestOutputHelper output) : base(output)
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/VirtualNetworkRuleTest.cs
@@ -25,10 +25,9 @@ public class VirtualNetworkRuleTest : SqlTestsBase
         protected override void SetupManagementClients(RestTestFramework.MockContext context)
         {
             var sqlClient = GetSqlClient(context);
-            var sqlLegacyClient = GetLegacySqlClient();
             var newResourcesClient = GetResourcesClient(context);
             var networkClient = GetNetworkClient(context);
-            Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient, networkClient);
+            Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient);
         }
         public VirtualNetworkRuleTest(ITestOutputHelper output) : base(output)
         {
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/AuditingEndpointsCommunicator.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/AuditingEndpointsCommunicator.cs
@@ -19,6 +19,7 @@
 using Microsoft.Azure.Management.Sql.LegacySdk;
 using Microsoft.Azure.Management.Sql.LegacySdk.Models;
 using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Sql.Auditing.Services
 {
@@ -133,7 +134,7 @@ public void SetServerAuditingPolicy(string resourceGroupName, string serverName,
                 {
                     break;
                 }
-                Task.Delay(2000); // wait 2 seconds between each poll
+                TestMockSupport.Delay(2000); // wait 2 seconds between each poll
             }
         }
 
diff --git a/src/ResourceManager/Sql/Commands.Sql/Elastic Pools/Services/AzureSqlElasticPoolCommunicator.cs b/src/ResourceManager/Sql/Commands.Sql/Elastic Pools/Services/AzureSqlElasticPoolCommunicator.cs
@@ -21,6 +21,7 @@
 using System.Linq;
 using System.Threading;
 using System;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Sql.ElasticPool.Services
 {
@@ -109,7 +110,7 @@ public Management.Sql.Models.ElasticPool CreateOrUpdate(string resourceGroupName
                     resourceGroupName, serverName, elasticPoolName, parameters).Result;
 
             // Sleep 5 seconds
-            Thread.Sleep(5000);
+            TestMockSupport.Delay(5000);
 
             return client.GetPutOrPatchOperationResultAsync(
                 createOrUpdateResponse, null, CancellationToken.None).Result.Body;

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,9 @@ public class AuditingClassicStorageTests : SqlTestsBase`
`25`	`25`	`protected override void SetupManagementClients(RestTestFramework.MockContext context)`
`26`	`26`	`{`
`27`	`27`	`var sqlClient = GetSqlClient(context);`
`28`		`- var sqlLegacyClient = GetLegacySqlClient();`
`29`		`- var storageV2Client = GetStorageV2Client();`
	`28`	`+ var storageV2Client = GetStorageV2Client(context);`
`30`	`29`	`var newResourcesClient = GetResourcesClient(context);`
`31`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);`
	`30`	`+ Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public AuditingClassicStorageTests(ITestOutputHelper output) : base(output)`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,9 @@ public class BlobAuditingClassicStorageTests : SqlTestsBase`
`25`	`25`	`protected override void SetupManagementClients(RestTestFramework.MockContext context)`
`26`	`26`	`{`
`27`	`27`	`var sqlClient = GetSqlClient(context);`
`28`		`- var sqlLegacyClient = GetLegacySqlClient();`
`29`		`- var storageV2Client = GetStorageV2Client();`
	`28`	`+ var storageV2Client = GetStorageV2Client(context);`
`30`	`29`	`var newResourcesClient = GetResourcesClient(context);`
`31`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client, newResourcesClient);`
	`30`	`+ Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public BlobAuditingClassicStorageTests(ITestOutputHelper output) : base(output)`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ public class DataMaskingTests : SqlTestsBase`
`25`	`25`	`protected override void SetupManagementClients(RestTestFramework.MockContext context)`
`26`	`26`	`{`
`27`	`27`	`var sqlClient = GetSqlClient(context);`
`28`		`- var sqlLegacyClient = GetLegacySqlClient();`
`29`	`28`	`var newResourcesClient = GetResourcesClient(context);`
`30`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient);`
	`29`	`+ Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient);`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public DataMaskingTests(ITestOutputHelper output) : base(output)`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,8 @@ protected override void SetupManagementClients(Rest.ClientRuntime.Azure.TestFram`
`29`	`29`	`{`
`30`	`30`	`// Only SqlClient is needed.`
`31`	`31`	`var sqlClient = GetSqlClient(context);`
`32`		`- var sqlLegacyClient = GetLegacySqlClient();`
`33`	`32`	`var newResourcesClient = GetResourcesClient(context);`
`34`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient);`
	`33`	`+ Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient);`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,9 @@ public class ThreatDetectionClassicStorageTests : SqlTestsBase`
`25`	`25`	`protected override void SetupManagementClients(RestTestFramework.MockContext context)`
`26`	`26`	`{`
`27`	`27`	`var sqlClient = GetSqlClient(context);`
`28`		`- var sqlLegacyClient = GetLegacySqlClient();`
`29`		`- var storageV2Client = GetStorageV2Client();`
	`28`	`+ var storageV2Client = GetStorageV2Client(context);`
`30`	`29`	`var newResourcesClient = GetResourcesClient(context);`
`31`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, storageV2Client,`
`32`		`- newResourcesClient);`
	`30`	`+ Helper.SetupSomeOfManagementClients(sqlClient, storageV2Client, newResourcesClient);`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`public ThreatDetectionClassicStorageTests(ITestOutputHelper output) : base(output)`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,9 @@ public class VirtualNetworkRuleTest : SqlTestsBase`
`25`	`25`	`protected override void SetupManagementClients(RestTestFramework.MockContext context)`
`26`	`26`	`{`
`27`	`27`	`var sqlClient = GetSqlClient(context);`
`28`		`- var sqlLegacyClient = GetLegacySqlClient();`
`29`	`28`	`var newResourcesClient = GetResourcesClient(context);`
`30`	`29`	`var networkClient = GetNetworkClient(context);`
`31`		`- Helper.SetupSomeOfManagementClients(sqlClient, sqlLegacyClient, newResourcesClient, networkClient);`
	`30`	`+ Helper.SetupSomeOfManagementClients(sqlClient, newResourcesClient, networkClient);`
`32`	`31`	`}`
`33`	`32`	`public VirtualNetworkRuleTest(ITestOutputHelper output) : base(output)`
`34`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`using Microsoft.Azure.Management.Sql.LegacySdk;`
`20`	`20`	`using Microsoft.Azure.Management.Sql.LegacySdk.Models;`
`21`	`21`	`using System.Threading.Tasks;`
	`22`	`+using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`22`	`23`
`23`	`24`	`namespace Microsoft.Azure.Commands.Sql.Auditing.Services`
`24`	`25`	`{`
`@@ -133,7 +134,7 @@ public void SetServerAuditingPolicy(string resourceGroupName, string serverName,`
`133`	`134`	`{`
`134`	`135`	`break;`
`135`	`136`	`}`
`136`		`- Task.Delay(2000); // wait 2 seconds between each poll`
	`137`	`+ TestMockSupport.Delay(2000); // wait 2 seconds between each poll`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`