From ea699bb0ba962a5fad6271eb4ba24771df91f4fc Mon Sep 17 00:00:00 2001
From: Michael Eischer <9106997+MichaelEischer@users.noreply.github.com>
Date: Sat, 20 Jun 2026 19:14:54 +0200
Subject: [PATCH] backend/rest: fix flaky test cleanup (#21901)

---
 internal/backend/util/defaults.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/backend/util/defaults.go b/internal/backend/util/defaults.go
index 8c9270c04..1f6c4965f 100644
--- a/internal/backend/util/defaults.go
+++ b/internal/backend/util/defaults.go
@@ -35,7 +35,12 @@ func DefaultDelete(ctx context.Context, be backend.Backend) error {
 
 	for _, t := range alltypes {
 		err := be.List(ctx, t, func(fi backend.FileInfo) error {
-			return be.Remove(ctx, backend.Handle{Type: t, Name: fi.Name})
+			err := be.Remove(ctx, backend.Handle{Type: t, Name: fi.Name})
+			if err != nil && be.IsNotExist(err) {
+				// deletion of files created by TestSaveError may happen with a delay for the REST server, so we ignore the error
+				err = nil
+			}
+			return err
 		})
 		if err != nil {
 			return err