You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/09/23 10:42:40 UTC

svn commit: r1174596 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test: java/org/apache/archiva/rest/services/RepositoriesServiceTest.java resources/META-INF/spring-context-test.xml

Author: brett
Date: Fri Sep 23 08:42:40 2011
New Revision: 1174596

URL: http://svn.apache.org/viewvc?rev=1174596&view=rev
Log:
make test more robust - the executor was previously disabled so it didn't operate and the queue removal was not reliable. Now wait for initial scan to complete, then force a scan.

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml

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=1174596&r1=1174595&r2=1174596&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 Sep 23 08:42:40 2011
@@ -66,19 +66,14 @@ public class RepositoriesServiceTest
 
         String repoId = managedRepositoriesService.getManagedRepositories().get( 0 ).getId();
 
-        // take care if already in scan queue by startup phase
-        if ( service.alreadyScanning( repoId ) )
+        int timeout = 20000;
+        while ( timeout > 0 && service.alreadyScanning( repoId ) )
         {
-            service.removeScanningTaskFromQueue( repoId );
-            assertFalse( service.alreadyScanning( repoId ) );
+            Thread.sleep( 500 );
+            timeout -= 500;
         }
 
         assertTrue( service.scanRepository( repoId, true ) );
-
-        log.info( "scanRepo call ok " );
-
-        assertTrue( service.alreadyScanning( repoId ) );
-
     }
 
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml?rev=1174596&r1=1174595&r2=1174596&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml Fri Sep 23 08:42:40 2011
@@ -56,4 +56,10 @@
       </value>
     </property>
   </bean>
+
+  <bean name="taskQueueExecutor#repository-scanning" class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false">
+    <property name="name" value="repository-scanning"/>
+    <property name="executor" ref="taskExecutor#repository-scanning"/>
+    <property name="queue" ref="taskQueue#repository-scanning"/>
+  </bean>
 </beans>
\ No newline at end of file