[FormRecognizer] Changing test location to West Central US + Live tes…

…ts fix (#12677)
Azure · Jun 10, 2020 · cdd3a31 · cdd3a31
1 parent 6ed841c
commit cdd3a31
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Constants.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Constants.cs
@@ -7,8 +7,6 @@ internal static class Constants
     {
         public const string AuthorizationHeader = "Ocp-Apim-Subscription-Key";
 
-        public const string LocationHeader = "Location";
-
         public const string OperationLocationHeader = "Operation-Location";
 
         public const string DefaultCognitiveScope = "https://cognitiveservices.azure.com/.default";

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClientOptions.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClientOptions.cs
@@ -58,9 +58,9 @@ internal static string GetVersionString(ServiceVersion version)
         /// </summary>
         private void AddLoggedHeadersAndQueryParameters()
         {
-            Diagnostics.LoggedHeaderNames.Add(Constants.LocationHeader);
             Diagnostics.LoggedHeaderNames.Add(Constants.OperationLocationHeader);
             Diagnostics.LoggedHeaderNames.Add("apim-request-id");
+            Diagnostics.LoggedHeaderNames.Add("Location");
             Diagnostics.LoggedHeaderNames.Add("Strict-Transport-Security");
             Diagnostics.LoggedHeaderNames.Add("X-Content-Type-Options");
             Diagnostics.LoggedHeaderNames.Add("x-envoy-upstream-service-time");

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormTrainingClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormTrainingClient.cs
@@ -318,7 +318,7 @@ public virtual CopyModelOperation StartCopyModel(string modelId, CopyAuthorizati
                                           new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn/*.ToUnixTimeSeconds()*/));
 
             Response response = ServiceClient.CopyCustomModel(guid, request, cancellationToken);
-            string location = ClientCommon.GetResponseHeader(response.Headers, Constants.LocationHeader);
+            string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
             return new CopyModelOperation(ServiceClient, Diagnostics, location, target.ModelId);
         }
@@ -344,7 +344,7 @@ public virtual async Task<CopyModelOperation> StartCopyModelAsync(string modelId
                                           new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn/*.ToUnixTimeSeconds()*/));
 
             Response response = await ServiceClient.CopyCustomModelAsync(guid, request, cancellationToken).ConfigureAwait(false);
-            string location = ClientCommon.GetResponseHeader(response.Headers, Constants.LocationHeader);
+            string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
             return new CopyModelOperation(ServiceClient, Diagnostics, location, target.ModelId);
         }

diff --git a/...nizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs b/...nizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs
@@ -838,7 +838,7 @@ public async Task StartRecognizeCustomFormsWithoutLabelsCanParseMultipageFormWit
         /// Recognizer cognitive service and handle returned errors.
         /// </summary>
         [Test]
-        [TestCase(true)]
+        [TestCase(true, Ignore = "https://github.com/Azure/azure-sdk-for-net/issues/12319")]
         [TestCase(false)]
         public async Task StartRecognizeCustomFormsFromUriThrowsForNonExistingContent(bool useTrainingLabels)
         {

diff --git a/sdk/formrecognizer/test-resources.json b/sdk/formrecognizer/test-resources.json
@@ -11,7 +11,7 @@
         },
         "location": {
             "type": "string",
-            "defaultValue": "[resourceGroup().location]",
+            "defaultValue": "westcentralus",
             "metadata": {
                 "description": "The location of the resource. By default, this is the same as the resource group."
             }