From: Olivier Lamy <olamy@apache.org>
Date: Fri, 29 Jun 2012 13:29:57 +0000 (+0000)
Subject: avoid jackrabbit failure on deleting a test repo
X-Git-Tag: archiva-1.4-M3~579
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e3885c59da2e4748e2ba494f3901902be0470067;p=archiva.git

avoid jackrabbit failure on deleting a test repo

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1355375 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
index 96ce88b09..80ecdfcd6 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
@@ -318,8 +318,7 @@ public class RepositoriesServiceTest
         }
         finally
         {
-            getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( managedRepository.getId(),
-                                                                                          true );
+            cleanQuietlyRepo( managedRepository.getId() );
         }
     }
 
@@ -336,8 +335,19 @@ public class RepositoriesServiceTest
         }
         finally
         {
-            getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( managedRepository.getId(),
-                                                                                          true );
+            cleanQuietlyRepo( managedRepository.getId() );
+        }
+    }
+
+    protected void cleanQuietlyRepo( String id )
+    {
+        try
+        {
+            getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( id, true );
+        }
+        catch ( Exception e )
+        {
+            log.info( "ignore issue deleting test repo: {}", e.getMessage() );
         }
     }