(jackrabbit-oak) branch trunk updated: OAK-11902: remove existing blobs in AzureTarWriterTest setup (#2512)

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 32d199ad97 OAK-11902: remove existing blobs in AzureTarWriterTest 
setup (#2512)
32d199ad97 is described below

commit 32d199ad9767735875e41dd09c02de050eed02d0
Author: Lucas Weitzendorf <lweitzend...@gmail.com>
AuthorDate: Tue Sep 16 18:47:39 2025 +0200

    OAK-11902: remove existing blobs in AzureTarWriterTest setup (#2512)
    
    Co-authored-by: Lucas Weitzendorf <lweitzend...@adobe.com>
---
 .../oak/segment/azure/AzureTarWriterTest.java           |  8 ++++++++
 .../oak/segment/azure/v8/AzureTarWriterV8Test.java      | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureTarWriterTest.java
 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureTarWriterTest.java
index a3ee015f87..ebf40e907f 100644
--- 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureTarWriterTest.java
+++ 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureTarWriterTest.java
@@ -25,11 +25,15 @@ import 
org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class AzureTarWriterTest extends TarWriterTest {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(AzureTarWriterTest.class);
+
     @ClassRule
     public static AzuriteDockerRule azurite = new AzuriteDockerRule();
 
@@ -40,6 +44,10 @@ public class AzureTarWriterTest extends TarWriterTest {
     public void setUp() throws Exception {
         readBlobContainerClient = 
azurite.getReadBlobContainerClient("oak-test");
         writeBlobContainerClient = 
azurite.getWriteBlobContainerClient("oak-test");
+        readBlobContainerClient.listBlobs().forEach(blobItem -> {
+            LOG.warn("Deleting blob {}", blobItem.getName());
+            
writeBlobContainerClient.getBlobClient(blobItem.getName()).delete();
+        });
     }
 
     @NotNull
diff --git 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureTarWriterV8Test.java
 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureTarWriterV8Test.java
index 18421c74e7..505f71ae4a 100644
--- 
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureTarWriterV8Test.java
+++ 
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureTarWriterV8Test.java
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.oak.segment.azure.v8;
 
+import com.microsoft.azure.storage.StorageException;
+import com.microsoft.azure.storage.blob.CloudBlob;
 import com.microsoft.azure.storage.blob.CloudBlobContainer;
 
 import 
org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzuriteDockerRule;
@@ -27,11 +29,15 @@ import 
org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class AzureTarWriterV8Test extends TarWriterTest {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(AzureTarWriterV8Test.class);
+
     @ClassRule
     public static AzuriteDockerRule azurite = new AzuriteDockerRule();
 
@@ -40,6 +46,17 @@ public class AzureTarWriterV8Test extends TarWriterTest {
     @Before
     public void setUp() throws Exception {
         container = azurite.getContainer("oak-test");
+        container.listBlobs().forEach(blob -> {
+            if (blob instanceof CloudBlob) {
+                CloudBlob cloudBlob = (CloudBlob) blob;
+                try {
+                    LOG.warn("Deleting blob {}", cloudBlob.getUri());
+                    cloudBlob.delete();
+                } catch (StorageException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
     }
 
     @NotNull