Skip to content

Commit

Permalink
re-enbale proxy tests?
Browse files Browse the repository at this point in the history
  • Loading branch information
timtay-microsoft committed Aug 7, 2024
1 parent 89e5b1e commit 2b660eb
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 32 deletions.
6 changes: 0 additions & 6 deletions e2e/test/iothub/messaging/MessageSendE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public async Task Message_DeviceSendSingleMessage_AmqpWs_WithHeartbeats()
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[TestCategory("LongRunning")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_DeviceSendSingleMessage_Http_WithProxy()
{
var httpTransportSettings = new Http1TransportSettings
Expand All @@ -119,7 +118,6 @@ public async Task Message_DeviceSendSingleMessage_Http_WithProxy()
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_DeviceSendSingleMessage_Http_WithCustomProxy()
{
var httpTransportSettings = new Http1TransportSettings();
Expand All @@ -135,7 +133,6 @@ public async Task Message_DeviceSendSingleMessage_Http_WithCustomProxy()
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[TestCategory("LongRunning")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_DeviceSendSingleMessage_AmqpWs_WithProxy()
{
var amqpTransportSettings = new AmqpTransportSettings(Client.TransportType.Amqp_WebSocket_Only)
Expand All @@ -150,7 +147,6 @@ public async Task Message_DeviceSendSingleMessage_AmqpWs_WithProxy()
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_DeviceSendSingleMessage_MqttWs_WithProxy()
{
var mqttTransportSettings = new MqttTransportSettings(Client.TransportType.Mqtt_WebSocket_Only)
Expand All @@ -165,7 +161,6 @@ public async Task Message_DeviceSendSingleMessage_MqttWs_WithProxy()
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_ModuleSendSingleMessage_AmqpWs_WithProxy()
{
var amqpTransportSettings = new AmqpTransportSettings(Client.TransportType.Amqp_WebSocket_Only)
Expand All @@ -180,7 +175,6 @@ public async Task Message_ModuleSendSingleMessage_AmqpWs_WithProxy()
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_ModuleSendSingleMessage_MqttWs_WithProxy()
{
var mqttTransportSettings = new MqttTransportSettings(Client.TransportType.Mqtt_WebSocket_Only)
Expand Down
2 changes: 0 additions & 2 deletions e2e/test/iothub/messaging/MessageSendFaultInjectionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ await SendMessageRecoveryAsync(
[TestCategory("Proxy")]
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_TcpConnectionLossSendRecovery_AmqpWs_WithProxy()
{
await SendMessageRecoveryAsync(
Expand Down Expand Up @@ -85,7 +84,6 @@ await SendMessageRecoveryAsync(
[TestCategory("Proxy")]
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Message_TcpConnectionLossSendRecovery_MqttWs_WithProxy()
{
await SendMessageRecoveryAsync(
Expand Down
2 changes: 0 additions & 2 deletions e2e/test/iothub/method/MethodE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ public async Task Method_DeviceReceivesMethodAndResponseWithDefaultMethodHandler

[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Method_ServiceSendsMethodThroughProxyWithDefaultTimeout()
{
var serviceClientTransportSettings = new ServiceClientTransportSettings
Expand All @@ -133,7 +132,6 @@ await SendMethodAndRespondAsync(
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task Method_ServiceSendsMethodThroughProxyWithCustomTimeout()
{
var serviceClientTransportSettings = new ServiceClientTransportSettings
Expand Down
1 change: 0 additions & 1 deletion e2e/test/iothub/service/IoTHubServiceProxyE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace Microsoft.Azure.Devices.E2ETests.IotHub.Service
[TestCategory("E2E")]
[TestCategory("IoTHub")]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public class IoTHubServiceProxyE2ETests : E2EMsTestBase
{
private readonly string DevicePrefix = $"{nameof(IoTHubServiceProxyE2ETests)}_";
Expand Down
2 changes: 0 additions & 2 deletions e2e/test/iothub/service/RegistryManagerE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class RegistryManagerE2ETests : E2EMsTestBase
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[ExpectedException(typeof(Common.Exceptions.IotHubCommunicationException))]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task RegistryManager_BadProxy_ThrowsException()
{
// arrange
Expand Down Expand Up @@ -331,7 +330,6 @@ public async Task RegistryManager_RemoveDevices2Async_Works()
[TestMethodWithRetry(Max = 3)]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task RegistryManager_AddDeviceWithProxy()
{
string deviceId = _idPrefix + Guid.NewGuid();
Expand Down
15 changes: 0 additions & 15 deletions e2e/test/provisioning/ProvisioningE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,13 @@ public async Task DPS_Registration_Http_Tpm_RegisterOk()

[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_Http_X509_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.X509, EnrollmentType.Individual, false).ConfigureAwait(false);
}

[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_Http_X509_GroupEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.X509, EnrollmentType.Group, false).ConfigureAwait(false);
Expand All @@ -104,7 +102,6 @@ public async Task DPS_Registration_Http_SymmetricKey_GroupEnrollment_RegisterOk(
[TestCategory("Proxy")]
[TestCategory("Flaky")] // Can't guarantee only a single test will make a call to tpm due to class-level parallelization
[DoNotParallelize] //TPM tests need to execute in serial as tpm only accepts one connection at a time
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_HttpWithProxy_Tpm_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.Tpm, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -116,7 +113,6 @@ public async Task DPS_Registration_HttpWithProxy_Tpm_RegisterOk()
[TestCategory("Flaky")] // Can't guarantee only a single test will make a call to tpm due to class-level parallelization
[DoNotParallelize] //TPM tests need to execute in serial as tpm only accepts one connection at a time
[TestCategory("LongRunning")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_HttpWithNullProxy_Tpm_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.Tpm, EnrollmentType.Individual, true).ConfigureAwait(false);
Expand All @@ -125,7 +121,6 @@ public async Task DPS_Registration_HttpWithNullProxy_Tpm_RegisterOk()
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_HttpWithProxy_SymmetricKey_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.SymmetricKey, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -134,7 +129,6 @@ public async Task DPS_Registration_HttpWithProxy_SymmetricKey_IndividualEnrollme
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_HttpWithProxy_SymmetricKey_GroupEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Http1, AttestationMechanismType.SymmetricKey, EnrollmentType.Group, true, s_proxyServerAddress).ConfigureAwait(false);
Expand Down Expand Up @@ -221,7 +215,6 @@ public async Task DPS_Registration_AmqpWs_SymmetricKey_GroupEnrollment_RegisterO
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_AmqpWsWithProxy_X509_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Amqp_WebSocket_Only, AttestationMechanismType.X509, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -230,7 +223,6 @@ public async Task DPS_Registration_AmqpWsWithProxy_X509_IndividualEnrollment_Reg
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_AmqpWsWithNullProxy_X509_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Amqp_WebSocket_Only, AttestationMechanismType.X509, EnrollmentType.Individual, true).ConfigureAwait(false);
Expand All @@ -240,7 +232,6 @@ public async Task DPS_Registration_AmqpWsWithNullProxy_X509_IndividualEnrollment
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[TestCategory("LongRunning")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_AmqpWsWithProxy_SymmetricKey_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Amqp_WebSocket_Only, AttestationMechanismType.SymmetricKey, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -249,7 +240,6 @@ public async Task DPS_Registration_AmqpWsWithProxy_SymmetricKey_IndividualEnroll
[TestCategory("Proxy")]
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_AmqpWsWithProxy_SymmetricKey_GroupEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Amqp_WebSocket_Only, AttestationMechanismType.SymmetricKey, EnrollmentType.Group, true, s_proxyServerAddress).ConfigureAwait(false);
Expand Down Expand Up @@ -318,7 +308,6 @@ public async Task DPS_Registration_MqttWs_SymmetricKey_GroupEnrollment_RegisterO
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_MqttWsWithProxy_X509_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Mqtt_WebSocket_Only, AttestationMechanismType.X509, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -327,7 +316,6 @@ public async Task DPS_Registration_MqttWsWithProxy_X509_IndividualEnrollment_Reg
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_MqttWsWithNullProxy_X509_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Mqtt_WebSocket_Only, AttestationMechanismType.X509, EnrollmentType.Individual, true).ConfigureAwait(false);
Expand All @@ -336,7 +324,6 @@ public async Task DPS_Registration_MqttWsWithNullProxy_X509_IndividualEnrollment
[TestCategory("Proxy")]
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_MqttWsWithProxy_SymmetricKey_IndividualEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Mqtt_WebSocket_Only, AttestationMechanismType.SymmetricKey, EnrollmentType.Individual, true, s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -345,7 +332,6 @@ public async Task DPS_Registration_MqttWsWithProxy_SymmetricKey_IndividualEnroll
[TestCategory("Proxy")]
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_MqttWsWithProxy_SymmetricKey_GroupEnrollment_RegisterOk()
{
await ProvisioningDeviceClient_ValidRegistrationId_Register_Ok(Client.TransportType.Mqtt_WebSocket_Only, AttestationMechanismType.SymmetricKey, EnrollmentType.Group, true, s_proxyServerAddress).ConfigureAwait(false);
Expand Down Expand Up @@ -583,7 +569,6 @@ public async Task DPS_Registration_AmqpWs_X509_GroupEnrollment_InvalidIdScope_Re
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("LongRunning")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task DPS_Registration_Mqtt_X509_IndividualEnrollment_InvalidGlobalAddress_RegisterFail()
{
await ProvisioningDeviceClientInvalidGlobalAddressRegisterFailAsync(Client.TransportType.Mqtt_Tcp_Only, AttestationMechanismType.X509, EnrollmentType.Individual).ConfigureAwait(false);
Expand Down
4 changes: 0 additions & 4 deletions e2e/test/provisioning/ProvisioningServiceClientE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public enum EnrollmentType
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task ProvisioningServiceClient_IndividualEnrollments_Query_HttpWithProxy_Ok()
{
await ProvisioningServiceClient_IndividualEnrollments_Query_Ok(s_proxyServerAddress).ConfigureAwait(false);
Expand All @@ -46,7 +45,6 @@ public async Task ProvisioningServiceClient_IndividualEnrollments_Query_HttpWith
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task ProvisioningServiceClient_Tpm_IndividualEnrollments_Create_HttpWithProxy_Ok()
{
await ProvisioningServiceClient_IndividualEnrollments_Create_Ok(s_proxyServerAddress, AttestationMechanismType.Tpm).ConfigureAwait(false);
Expand All @@ -55,7 +53,6 @@ public async Task ProvisioningServiceClient_Tpm_IndividualEnrollments_Create_Htt
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task ProvisioningServiceClient_SymmetricKey_IndividualEnrollments_Create_HttpWithProxy_Ok()
{
await ProvisioningServiceClient_IndividualEnrollments_Create_Ok(s_proxyServerAddress, AttestationMechanismType.SymmetricKey).ConfigureAwait(false);
Expand All @@ -78,7 +75,6 @@ public async Task ProvisioningServiceClient_SymmetricKey_IndividualEnrollments_C
[TestMethod]
[Timeout(TestTimeoutMilliseconds)]
[TestCategory("Proxy")]
[Ignore("Azure DevOps Windows test environment doesn't support proxies currently")]
public async Task ProvisioningServiceClient_SymmetricKey_GroupEnrollments_Create_HttpWithProxy_Ok()
{
await ProvisioningServiceClient_GroupEnrollments_Create_Ok(s_proxyServerAddress, AttestationMechanismType.SymmetricKey).ConfigureAwait(false);
Expand Down

0 comments on commit 2b660eb

Please sign in to comment.