Live test fix

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobAPITest.groovy

@@ -2266,7 +2266,6 @@ class BlobAPITest extends APISpec {
 
         when:
         def undeleteHeaders = bc.undeleteWithResponse(null, null).getHeaders()
-
         bc.getProperties()
 
         then:

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAPITest.groovy

@@ -273,8 +273,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
@@ -292,6 +295,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()

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)
     }