svn commit: r954303 - in /felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test: SharingDependenciesWithMultipleServicesTest.java annotation/FactoryConfigurationAdapterAnnotationTest.java

[pderop]

Author: pderop
Date: Sun Jun 13 20:35:13 2010
New Revision: 954303

URL: http://svn.apache.org/viewvc?rev=954303&view=rev
Log:
Added a work around regarding the bug from CM FELIX-1545 issue

Modified:
    
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
    
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java

Modified: 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java?rev=954303&r1=954302&r2=954303&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
 (original)
+++ 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
 Sun Jun 13 20:35:13 2010
@@ -98,9 +98,15 @@ public class SharingDependenciesWithMult
         // add the first consumer, and wait until its updated() method is 
invoked
         m.add(consumer1);
         e.waitForStep(2, 15000);
+        // Avoid bug in CM (FELIX-1545), which may miss some updates
+        sleep(200);
+
         // add the second consumer, and wait until its updated() method is 
invoked
         m.add(consumer2);
         e.waitForStep(3, 15000);
+        // Avoid bug in CM (FELIX-1545), which may miss some updates
+        sleep(200);
+
         // break down the test again
         m.remove(consumer2);
         m.remove(consumer1);

Modified: 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java?rev=954303&r1=954302&r2=954303&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
 (original)
+++ 
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
 Sun Jun 13 20:35:13 2010
@@ -82,13 +82,13 @@ public class FactoryConfigurationAdapter
             // Wait for the ServiceProvider activation.
             m_ensure.waitForStep(2, 10000);
             // Avoid bug in CM (FELIX-1545), which may miss some updates
-            sleep(50); 
+            sleep(200); 
             // Update conf
             cf.update(new Hashtable() {{ put("foo", "bar2"); }});            
             // Wait for effective update
             m_ensure.waitForStep(4, 10000);
             // Avoid bug in CM (FELIX-1545), which may miss some updates
-            sleep(50);
+            sleep(200);
             // Remove configuration.
             cf.delete();
             // Check if ServiceProvider has been stopped.