Live test fix (#13207)

* Live test fix * Added some logging to undelete * Added recording * Added slf4j * Tags are eventually consistent * Enabled debug logging * https * Trying a sleep * More logging * Logging for listing tests * Undid some logging. Removed versioning from arm template * Created a separate account in the arm template for accounts with versioning * Fixed arm template * Fixed find blobs marker
AzureSDKAutomation · Jul 20, 2020 · 26813b2 · 26813b2
1 parent 8ee3239
commit 26813b2
Show file tree

Hide file tree

Showing 5 changed files with 141 additions and 101 deletions.
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy
@@ -2528,7 +2528,6 @@ class BlobAPITest extends APISpec {
 
         when:
         def undeleteHeaders = bc.undeleteWithResponse(null, null).getHeaders()
-
         bc.getProperties()
 
         then:

diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAPITest.groovy
@@ -274,8 +274,11 @@ class ServiceAPITest extends APISpec {
         blobClient = containerClient.getBlobClient(generateBlobName())
         blobClient.upload(defaultInputStream.get(), defaultDataSize)
 
+        sleepIfRecord(10 * 1000) // To allow tags to index
+
         when:
-        def results = primaryBlobServiceClient.findBlobsByTags("\"bar\"='foo'")
+        def results = primaryBlobServiceClient.findBlobsByTags(String.format("@container='%s' AND \"bar\"='foo'",
+            containerClient.getBlobContainerName()))
 
         then:
         results.size() == 1
@@ -293,6 +296,8 @@ class ServiceAPITest extends APISpec {
                 new BlobParallelUploadOptions(defaultInputStream.get(), defaultDataSize).setTags(tags), null, null)
         }
 
+        sleepIfRecord(10 * 1000) // To allow tags to index
+
         def firstPage = primaryBlobServiceClient.findBlobsByTags(new FindBlobsOptions("\"tag\"='value'")
             .setMaxResultsPerPage(5), null, Context.NONE)
             .iterableByPage().iterator().next()

diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/VersioningTest.groovy
@@ -30,7 +30,7 @@ class VersioningTest extends APISpec {
     def setup() {
         blobName = generateBlobName()
         containerName = generateContainerName()
-        blobContainerClient = primaryBlobServiceClient.createBlobContainer(containerName)
+        blobContainerClient = versionedBlobServiceClient.createBlobContainer(containerName)
         blobClient = blobContainerClient.getBlobClient(blobName)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2528,7 +2528,6 @@ class BlobAPITest extends APISpec { @@
             when:
             def undeleteHeaders = bc.undeleteWithResponse(null, null).getHeaders()
             bc.getProperties()
             then:
@@ Expand Down @@