Added a work around regarding the bug from CM FELIX-1545 issue
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@954303 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
index 2d4f510..4066d1b 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
@@ -98,9 +98,15 @@
// 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);
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
index 84a684d..8fd54a3 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/FactoryConfigurationAdapterAnnotationTest.java
@@ -82,13 +82,13 @@
// 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.