diff options
| author | mkuppe | 2010-07-31 11:37:51 +0000 |
|---|---|---|
| committer | mkuppe | 2010-07-31 11:37:51 +0000 |
| commit | c605722c8644c6dae2665690590dd3585a679008 (patch) | |
| tree | 025a3d565c8ae3fa99250d1fec369aafd75950b8 /tests/bundles/org.eclipse.ecf.tests.provider.discovery | |
| parent | 2a52e0a7e27e45cbb2492adc2c3e5974eb8c82c4 (diff) | |
| download | org.eclipse.ecf-c605722c8644c6dae2665690590dd3585a679008.tar.gz org.eclipse.ecf-c605722c8644c6dae2665690590dd3585a679008.tar.xz org.eclipse.ecf-c605722c8644c6dae2665690590dd3585a679008.zip | |
NEW - bug 320612: [Discovery] Unit tests fail due to broken detection of external ip address
https://bugs.eclipse.org/bugs/show_bug.cgi?id=320612
Be liberal when starting the bundle WRT to old bundle state in tearDown
Diffstat (limited to 'tests/bundles/org.eclipse.ecf.tests.provider.discovery')
| -rw-r--r-- | tests/bundles/org.eclipse.ecf.tests.provider.discovery/src/org/eclipse/ecf/tests/provider/discovery/SingleCompositeDiscoveryServiceContainerTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/src/org/eclipse/ecf/tests/provider/discovery/SingleCompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/src/org/eclipse/ecf/tests/provider/discovery/SingleCompositeDiscoveryServiceContainerTest.java index 0e6fe9d58..5c44a403b 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/src/org/eclipse/ecf/tests/provider/discovery/SingleCompositeDiscoveryServiceContainerTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/src/org/eclipse/ecf/tests/provider/discovery/SingleCompositeDiscoveryServiceContainerTest.java @@ -104,8 +104,9 @@ public abstract class SingleCompositeDiscoveryServiceContainerTest extends } } assertNotNull(bundleName + " bundle not found", bundle); - assertTrue(bundle.getState() == Bundle.RESOLVED); - bundle.start(); + if(bundle.getState() != Bundle.ACTIVE) { + bundle.start(); + } assertTrue(bundle.getState() == Bundle.ACTIVE); // reset so other instances can reuse |