[FormRecognizer] Removed IgnoreServiceError attributes and overrode I…

…sEnvironmentReady method (#37858)
Azure · Jul 27, 2023 · f6fc3de · f6fc3de
1 parent 67a9768
commit f6fc3de
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/...r/Azure.AI.FormRecognizer/tests/DocumentAnalysisClient/DocumentAnalysisClientLiveTests.cs b/...r/Azure.AI.FormRecognizer/tests/DocumentAnalysisClient/DocumentAnalysisClientLiveTests.cs
@@ -20,7 +20,6 @@ namespace Azure.AI.FormRecognizer.DocumentAnalysis.Tests
     /// These tests have a dependency on live Azure services and may incur costs for the associated
     /// Azure subscription.
     /// </remarks>
-    [IgnoreServiceError(400, "InvalidRequest", Message = "Content is not accessible: Invalid data URL", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28923")]
     public class DocumentAnalysisClientLiveTests : DocumentAnalysisLiveTestBase
     {
         /// <summary>

diff --git a/...ormrecognizer/Azure.AI.FormRecognizer/tests/DocumentAnalysisModels/OperationsLiveTests.cs b/...ormrecognizer/Azure.AI.FormRecognizer/tests/DocumentAnalysisModels/OperationsLiveTests.cs
@@ -16,7 +16,6 @@ namespace Azure.AI.FormRecognizer.DocumentAnalysis.Tests
     /// These tests have a dependency on live Azure services and may incur costs for the associated
     /// Azure subscription.
     /// </remarks>
-    [IgnoreServiceError(400, "InvalidRequest", Message = "Content is not accessible: Invalid data URL", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28923")]
     public class OperationsLiveTests : DocumentAnalysisLiveTestBase
     {
         /// <summary>

diff --git a/...ecognizer/tests/DocumentModelAdministrationClient/DocumentModelAdministrationLiveTests.cs b/...ecognizer/tests/DocumentModelAdministrationClient/DocumentModelAdministrationLiveTests.cs
@@ -17,7 +17,6 @@ namespace Azure.AI.FormRecognizer.DocumentAnalysis.Tests
     /// These tests have a dependency on live Azure services and may incur costs for the associated
     /// Azure subscription.
     /// </remarks>
-    [IgnoreServiceError(400, "InvalidRequest", Message = "Content is not accessible: Invalid data URL", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28923")]
     public class DocumentModelAdministrationLiveTests : DocumentAnalysisLiveTestBase
     {
         private static readonly DocumentBuildMode[] s_buildDocumentModelTestCases = new[]

diff --git a/...ormRecognizer/tests/DocumentModelAdministrationClient/MiscellaneousOperationsLiveTests.cs b/...ormRecognizer/tests/DocumentModelAdministrationClient/MiscellaneousOperationsLiveTests.cs
@@ -17,7 +17,6 @@ namespace Azure.AI.FormRecognizer.DocumentAnalysis.Tests
     /// These tests have a dependency on live Azure services and may incur costs for the associated
     /// Azure subscription.
     /// </remarks>
-    [IgnoreServiceError(400, "InvalidRequest", Message = "Content is not accessible: Invalid data URL", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28923")]
     public class MiscellaneousOperationsLiveTests : DocumentAnalysisLiveTestBase
     {
         private readonly IReadOnlyDictionary<string, string> _testingTags = new Dictionary<string, string>()

diff --git a/...nizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/RecognizeCustomFormsLiveTests.cs b/...nizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/RecognizeCustomFormsLiveTests.cs
@@ -20,7 +20,6 @@ namespace Azure.AI.FormRecognizer.Tests
     [ClientTestFixture(
     FormRecognizerClientOptions.ServiceVersion.V2_0,
     FormRecognizerClientOptions.ServiceVersion.V2_1)]
-    [IgnoreServiceError(200, "3014", Message = "Generic error during training.", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28913")]
     public class RecognizeCustomFormsLiveTests : FormRecognizerLiveTestBase
     {
         public RecognizeCustomFormsLiveTests(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)

diff --git a/...ecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs b/...ecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
@@ -19,7 +19,6 @@ namespace Azure.AI.FormRecognizer.Tests
     /// These tests have a dependency on live Azure services and may incur costs for the associated
     /// Azure subscription.
     /// </remarks>
-    [IgnoreServiceError(200, "3014", Message = "Generic error during training.", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28913")]
     public class FormTrainingClientLiveTests : FormRecognizerLiveTestBase
     {
         /// <summary>

diff --git a/...ecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/DocumentAnalysisTestEnvironment.cs b/...ecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/DocumentAnalysisTestEnvironment.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 using Azure.Core.TestFramework;
 
 namespace Azure.AI.FormRecognizer.DocumentAnalysis.Tests
@@ -73,6 +74,26 @@ public class DocumentAnalysisTestEnvironment : TestEnvironment
         /// </summary>
         public string ClassifierTrainingSasUrl => GetRecordedVariable("CLASSIFIER_BLOB_CONTAINER_SAS_URL", options => options.IsSecret(SanitizedSasUrl));
 
+        protected override async ValueTask<bool> IsEnvironmentReadyAsync()
+        {
+            var endpoint = new Uri(Endpoint);
+            var keyCredential = new AzureKeyCredential(ApiKey);
+            var keyCredentialClient = new DocumentModelAdministrationClient(endpoint, keyCredential);
+            var tokenCredentialClient = new DocumentModelAdministrationClient(endpoint, Credential);
+
+            try
+            {
+                await keyCredentialClient.GetResourceDetailsAsync();
+                await tokenCredentialClient.GetResourceDetailsAsync();
+            }
+            catch (RequestFailedException e) when (e.Status == 401)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Creates an absolute path to a file contained in the local test assets folder.
         /// </summary>

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/DocumentAnalysisSamples.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/DocumentAnalysisSamples.cs
@@ -8,7 +8,6 @@ namespace Azure.AI.FormRecognizer.DocumentAnalysis.Samples
 {
     [LiveOnly]
     [AsyncOnly] // Ensure that each sample will only run once.
-    [IgnoreServiceError(400, "InvalidRequest", Message = "Content is not accessible: Invalid data URL", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28923")]
     public partial class DocumentAnalysisSamples : RecordedTestBase<DocumentAnalysisTestEnvironment>
     {
         public DocumentAnalysisSamples(bool isAsync) : base(isAsync, RecordedTestMode.Live)

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/V3.1/FormRecognizerSamples.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/samples/V3.1/FormRecognizerSamples.cs
@@ -8,7 +8,6 @@ namespace Azure.AI.FormRecognizer.Samples
 {
     [LiveOnly]
     [AsyncOnly] // Ensure that each sample will only run once.
-    [IgnoreServiceError(200, "3014", Message = "Generic error during training.", Reason = "https://github.com/Azure/azure-sdk-for-net/issues/28913")]
     public partial class FormRecognizerSamples : RecordedTestBase<FormRecognizerTestEnvironment>
     {
         public FormRecognizerSamples(bool isAsync) : base(isAsync, RecordedTestMode.Live)