You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/06/29 15:29:58 UTC

svn commit: r1355375 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java

Author: olamy
Date: Fri Jun 29 13:29:57 2012
New Revision: 1355375

URL: http://svn.apache.org/viewvc?rev=1355375&view=rev
Log:
avoid jackrabbit failure on deleting a test repo

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java?rev=1355375&r1=1355374&r2=1355375&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java Fri Jun 29 13:29:57 2012
@@ -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() );
         }
     }