Added missing variables from ARM deployment, fixed expected environme…

…nt variable name, fixed transient test that was missing a sleep (#7352)
Azure · Jan 13, 2020 · 14c8c1d · 14c8c1d
1 parent 409efc5
commit 14c8c1d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/APISpec.groovy b/...torage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/APISpec.groovy
@@ -295,4 +295,12 @@ class APISpec extends Specification {
     InputStream getInputStream(byte[] data) {
         return new ByteArrayInputStream(data)
     }
+
+    void sleepIfLive(long milliseconds) {
+        if (testMode == TestMode.PLAYBACK) {
+            return
+        }
+
+        sleep(milliseconds)
+    }
 }
diff --git a/...e-storage-file-share/src/test/java/com/azure/storage/file/share/FileSasClientTests.groovy b/...e-storage-file-share/src/test/java/com/azure/storage/file/share/FileSasClientTests.groovy
@@ -1,6 +1,6 @@
 package com.azure.storage.file.share
 
-import com.azure.storage.common.StorageSharedKeyCredential
+
 import com.azure.storage.common.implementation.Constants
 import com.azure.storage.common.sas.AccountSasPermission
 import com.azure.storage.common.sas.AccountSasResourceType
@@ -116,8 +116,12 @@ class FileSasClientTests extends APISpec {
             .setId("0000")
             .setAccessPolicy(new ShareAccessPolicy().setPermissions("rcwdl")
                 .setExpiresOn(getUTCNow().plusDays(1)))
+
         primaryShareClient.setAccessPolicy(Arrays.asList(identifier))
 
+        // Sleep 30 seconds if running against the live service as it may take ACLs that long to take effect.
+        sleepIfLive(30000)
+
         // Check shareSASPermissions
         ShareSasPermission permissions = new ShareSasPermission()
             .setReadPermission(true)

diff --git a/sdk/storage/test-resources.json b/sdk/storage/test-resources.json
@@ -215,10 +215,26 @@
             "type": "string",
             "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('premiumAccountName')), variables('storageApiVersion')).keys[0].value]"
         },
+        "AZURE_STORAGE_FILE_ACCOUNT_NAME": {
+            "type": "string",
+            "value": "[variables('primaryAccountName')]"
+        },
+        "AZURE_STORAGE_FILE_ACCOUNT_KEY": {
+            "type": "string",
+            "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('storageApiVersion')).keys[0].value]"
+        },
         "AZURE_STORAGE_FILE_ENDPOINT": {
             "type": "string",
             "value": "[reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('storageApiVersion')).primaryEndpoints.file]"
         },
+        "AZURE_STORAGE_QUEUE_ACCOUNT_NAME": {
+            "type": "string",
+            "value": "[variables('primaryAccountName')]"
+        },
+        "AZURE_STORAGE_QUEUE_ACCOUNT_KEY": {
+            "type": "string",
+            "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('storageApiVersion')).keys[0].value]"
+        },
         "AZURE_STORAGE_QUEUE_ENDPOINT": {
             "type": "string",
             "value": "[reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('storageApiVersion')).primaryEndpoints.queue]"

diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml
@@ -27,5 +27,5 @@ jobs:
         STORAGE_DATA_LAKE_ACCOUNT_KEY: $(STORAGE_DATA_LAKE_ACCOUNT_KEY)
         AZURE_STORAGE_FILE_ACCOUNT_NAME: $(AZURE_STORAGE_FILE_ACCOUNT_NAME)
         AZURE_STORAGE_FILE_ACCOUNT_KEY: $(AZURE_STORAGE_FILE_ACCOUNT_KEY)
-        AZURE_STORAGE_QUEUE_ACCOUNT_NAME: $(AZURE_STORAGE_FILE_ACCOUNT_NAME)
+        AZURE_STORAGE_QUEUE_ACCOUNT_NAME: $(AZURE_STORAGE_QUEUE_ACCOUNT_NAME)
         AZURE_STORAGE_QUEUE_ACCOUNT_KEY: $(AZURE_STORAGE_QUEUE_ACCOUNT_KEY)