Last device leaks (#3152)

Author: David R. Williamson

e2e/test/iothub/device/MethodE2ECustomPayloadTests.cs

@@ -113,8 +113,8 @@ private async Task SendMethodAndRespondAsync(
         {
             await using TestDevice testDevice = await TestDevice.GetTestDeviceAsync(_devicePrefix).ConfigureAwait(false);
             var options = new IotHubClientOptions(transportSettings);
-            await using var deviceClient = new IotHubDeviceClient(testDevice.ConnectionString, options);
-            await TestDevice.OpenWithRetryAsync(deviceClient).ConfigureAwait(false);
+            IotHubDeviceClient deviceClient = testDevice.CreateDeviceClient(options);
+            await testDevice.OpenWithRetryAsync().ConfigureAwait(false);
 
             Task methodReceivedTask = await setDeviceReceiveMethod(deviceClient, MethodName).ConfigureAwait(false);
             Task serviceSendTask = ServiceSendMethodAndVerifyResponseAsync(
@@ -136,7 +136,7 @@ public static async Task ServiceSendMethodAndVerifyResponseAsync<T>(
             TimeSpan responseTimeout = default,
             IotHubServiceClientOptions serviceClientTransportSettings = default)
         {
-            var serviceClient = TestDevice.ServiceClient;
+            IotHubServiceClient serviceClient = TestDevice.ServiceClient;
             TimeSpan methodTimeout = responseTimeout == default ? s_defaultMethodTimeoutMinutes : responseTimeout;
             VerboseTestLogger.WriteLine($"{nameof(ServiceSendMethodAndVerifyResponseAsync)}: Invoke method {methodName}.");
 

e2e/test/provisioning/ProvisioningE2ETests.cs

@@ -583,7 +583,7 @@ await ProvisioningDeviceClientInvalidGlobalAddressRegisterFailAsync(
 
         #endregion InvalidGlobalAddress
 
-        public async Task ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(
+        private async Task ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(
             IotHubClientTransportSettings transportSettings,
             AttestationMechanismType attestationType,
             EnrollmentType? enrollmentType,
@@ -605,7 +605,7 @@ await ProvisioningDeviceClientValidRegistrationIdRegisterOkAsync(
                 .ConfigureAwait(false);
         }
 
-        public async Task ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(
+        private async Task ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(
             IotHubClientTransportSettings transportSettings,
             AttestationMechanismType attestationType,
             EnrollmentType? enrollmentType,
@@ -694,7 +694,7 @@ private async Task ProvisioningDeviceClientValidRegistrationIdRegisterOkAsync(
                     try
                     {
                         result = await provClient.RegisterAsync(cts.Token).ConfigureAwait(false);
-                     deviceId = result.DeviceId;
+                        deviceId = result.DeviceId;
                         break;
                     }
                     // Catching all ProvisioningClientException as the status code is not the same for Mqtt, Amqp and Http.
@@ -722,17 +722,17 @@ private async Task ProvisioningDeviceClientValidRegistrationIdRegisterOkAsync(
                 {
                     VerboseTestLogger.WriteLine($"Deleting test enrollment type {attestationType}-{enrollmentType} with registration Id {auth.GetRegistrationId()}.");
                     await DeleteCreatedEnrollmentAsync(enrollmentType, auth, groupId).ConfigureAwait(false);
-                    if (deviceId != null)
-                    {
-                        VerboseTestLogger.WriteLine($"Deleting device {deviceId}...");
-                        await TestDevice.ServiceClient.Devices.DeleteAsync(deviceId).ConfigureAwait(false);
-                    }
                 }
                 else
                 {
                     VerboseTestLogger.WriteLine($"The test enrollment type {attestationType}-{enrollmentType} with group Id {groupId} is currently hardcoded - do not delete.");
                 }
 
+                if (deviceId != null)
+                {
+                    await TestDevice.ServiceClient.Devices.DeleteAsync(deviceId).ConfigureAwait(false);
+                }
+
                 if (authMethod is AuthenticationProviderX509 x509Auth)
                 {
                     X509Certificate2 deviceCertificate = x509Auth.ClientCertificate;