Bug 540069 - disable tests for posix related code on Windows
Bug 540310 added code that only works on posix systems. It makes no
sense to run tests for this code on Windows.
Change-Id: Ia3185b2435d2d50ca87054b139b37de34027136e
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
index 7cecf5d..b3c9608 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
@@ -26,6 +26,7 @@
import java.util.Properties;
import org.eclipse.equinox.internal.simpleconfigurator.SimpleConfiguratorImpl;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest;
public class SimpleConfiguratorTest extends AbstractProvisioningTest {
@@ -143,6 +144,10 @@
// master modified, but the mtime of the master config is set to zero --> choose master
public void testSharedConfigurationMasterModifiedNoMtime() throws IOException {
+ if (AbstractSharedInstallTest.WINDOWS) {
+ // See bug 540069 and bug 540310. Test below is for posix OS only
+ return;
+ }
clearLastModified(masterConfguration, true);
assertEquals(sharedConfiguration[1], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
assertIsPropertySet(true);
@@ -150,6 +155,10 @@
// master not modified, but the mtime of the master config is set to zero --> choose user
public void testSharedConfigurationMasterUnmodifiedNoMtime() throws IOException {
+ if (AbstractSharedInstallTest.WINDOWS) {
+ // See bug 540069 and bug 540310. Test below is for posix OS only
+ return;
+ }
clearLastModified(masterConfguration, false);
assertEquals(sharedConfiguration[0], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
assertIsPropertySet(false);
