You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/09/20 00:53:55 UTC
svn commit: r1704089 -
/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
Author: pderop
Date: Sat Sep 19 22:53:55 2015
New Revision: 1704089
URL: http://svn.apache.org/viewvc?rev=1704089&view=rev
Log:
Fixed a bug: we must wait for the configuration to be effectively removed at the end of each test iteration.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java?rev=1704089&r1=1704088&r2=1704089&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java Sat Sep 19 22:53:55 2015
@@ -207,10 +207,12 @@ public class ServiceRaceTest extends Tes
});
// Remove configuration (asynchronously)
+ final Ensure stepConfDeleted = new Ensure(false);
schedule(new Runnable() {
public void run() {
try {
conf.delete();
+ stepConfDeleted.step(1);
}
catch (IOException e) {
warn("error while unconfiguring", e);
@@ -222,6 +224,8 @@ public class ServiceRaceTest extends Tes
expectedStep += 2; // stop/destroy
expectedStep += DEPENDENCIES; // removed all dependencies
step.waitForStep(expectedStep, STEP_WAIT);
+ // Make sure configuration is removed
+ stepConfDeleted.waitForStep(1, STEP_WAIT);
step.ensure();
Assert.assertEquals(0, clientImpl.getDependencies());