Fix some flaky live tests (Azure#22913)

Author: jalauzon-msft

sdk/storage/azure-storage-blob/tests/test_blob_encryption.py

@@ -189,7 +189,7 @@ def test_invalid_value_kek_unwrap(self, storage_account_name, storage_account_ke
 
         with self.assertRaises(HttpResponseError) as e:
             blob.download_blob().content_as_bytes()
-        self.assertEqual(str(e.exception), 'Decryption failed.')
+        self.assertTrue('Decryption failed.' in str(e.exception))
 
     @BlobPreparer()
     def test_get_blob_kek(self, storage_account_name, storage_account_key):
@@ -252,7 +252,7 @@ def test_get_blob_nonmatching_kid(self, storage_account_name, storage_account_ke
         # Assert
         with self.assertRaises(HttpResponseError) as e:
             blob.download_blob().content_as_bytes()
-        self.assertEqual(str(e.exception), 'Decryption failed.')
+        self.assertTrue('Decryption failed.' in str(e.exception))
 
     @BlobPreparer()
     def test_put_blob_invalid_stream_type(self, storage_account_name, storage_account_key):

sdk/storage/azure-storage-blob/tests/test_blob_encryption_async.py

@@ -217,7 +217,7 @@ async def test_invalid_value_kek_unwrap_async(self, storage_account_name, storag
 
         with self.assertRaises(HttpResponseError) as e:
             await (await blob.download_blob()).content_as_bytes()
-        self.assertEqual(str(e.exception), 'Decryption failed.')
+        self.assertTrue('Decryption failed.' in str(e.exception))
 
     @BlobPreparer()
     @AsyncStorageTestCase.await_prepared_test
@@ -287,7 +287,7 @@ async def test_get_blob_nonmatching_kid_async(self, storage_account_name, storag
         # Assert
         with self.assertRaises(HttpResponseError) as e:
             await (await blob.download_blob()).content_as_bytes()
-        self.assertEqual(str(e.exception), 'Decryption failed.')
+        self.assertTrue('Decryption failed.' in str(e.exception))
 
     @BlobPreparer()
     @AsyncStorageTestCase.await_prepared_test

sdk/storage/azure-storage-blob/tests/test_common_blob.py

@@ -148,7 +148,7 @@ def _enable_soft_delete(self):
         # wait until the policy has gone into effect
         if self.is_live:
             self.bsc.set_service_properties(delete_retention_policy=delete_retention_policy)
-            time.sleep(30)
+            time.sleep(35)
 
     def _disable_soft_delete(self):
         delete_retention_policy = RetentionPolicy(enabled=False)

sdk/storage/azure-storage-blob/tests/test_common_blob_async.py

@@ -166,7 +166,7 @@ async def _enable_soft_delete(self):
 
         # wait until the policy has gone into effect
         if self.is_live:
-            time.sleep(30)
+            time.sleep(35)
 
     async def _disable_soft_delete(self):
         delete_retention_policy = RetentionPolicy(enabled=False)