Add some delay in the ConfigurationBindingTest to ensure newly created configurations are not immediately distributed to starting bundles.
Add option to wait for the framework to start without timing out. This prevents test failures on slow machines.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@989508 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
index d4c4be7..159c588 100644
--- a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
+++ b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
@@ -292,6 +292,9 @@
config.setBundleLocation( location );
TestCase.assertEquals( location, config.getBundleLocation() );
+ // ensure configuration is settled before starting the bundle
+ delay();
+
bundle.start();
// give cm time for distribution
@@ -426,6 +429,9 @@
config.setBundleLocation( location );
TestCase.assertEquals( location, config.getBundleLocation() );
+ // ensure configuration is settled before starting the bundle
+ delay();
+
// start the bundle
bundle.start();
delay();
diff --git a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
index 0dcf3c1..e012e24 100644
--- a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
+++ b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
@@ -22,6 +22,7 @@
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -123,7 +124,8 @@
provision(
CoreOptions.bundle( bundleFile.toURI().toString() ),
mavenBundle( "org.ops4j.pax.swissbox", "pax-swissbox-tinybundles", "1.0.0" )
- )
+ ),
+ waitForFrameworkStartup()
);
final Option vmOption = ( paxRunnerVmOption != null ) ? PaxRunnerOptions.vmOption( paxRunnerVmOption ) : null;
return OptionUtils.combine( base, vmOption );