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

[olamy]

Author: olamy
Date: Sat Feb 11 08:07:37 2012
New Revision: 1243016

URL: http://svn.apache.org/viewvc?rev=1243016&view=rev
Log:
wait end of first scan before deleting repo should prevent test failure

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

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.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/ManagedRepositoriesServiceTest.java?rev=1243016&r1=1243015&r2=1243016&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
 Sat Feb 11 08:07:37 2012
@@ -50,6 +50,15 @@ public class ManagedRepositoriesServiceT
         service.addManagedRepository( repo );
         assertNotNull( service.getManagedRepository( repo.getId() ) );
 
+        RepositoriesService repositoriesService = getRepositoriesService( 
authorizationHeader );
+
+        int timeout = 20000;
+        while ( timeout > 0 && repositoriesService.alreadyScanning( 
repo.getId() ) )
+        {
+            Thread.sleep( 500 );
+            timeout -= 500;
+        }
+
         service.deleteManagedRepository( repo.getId(), true );
         assertNull( service.getManagedRepository( repo.getId() ) );
     }
@@ -67,6 +76,16 @@ public class ManagedRepositoriesServiceT
             assertNull( service.getManagedRepository( repo.getId() ) );
         }
         service.addManagedRepository( repo );
+
+        RepositoriesService repositoriesService = getRepositoriesService( 
authorizationHeader );
+
+        int timeout = 20000;
+        while ( timeout > 0 && repositoriesService.alreadyScanning( 
repo.getId() ) )
+        {
+            Thread.sleep( 500 );
+            timeout -= 500;
+        }
+
         repo = service.getManagedRepository( repo.getId() );
         assertNotNull( repo );
         assertEquals( "test", repo.getName() );
@@ -79,6 +98,13 @@ public class ManagedRepositoriesServiceT
         assertNotNull( repo );
         assertEquals( "toto", repo.getName() );
 
+        timeout = 20000;
+        while ( timeout > 0 && repositoriesService.alreadyScanning( 
repo.getId() ) )
+        {
+            Thread.sleep( 500 );
+            timeout -= 500;
+        }
+
         service.deleteManagedRepository( repo.getId(), true );
         assertNull( service.getManagedRepository( repo.getId() ) );