From a7b241bbc77416c8f40d8767a78e0cb0ef3bc357 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 19 Sep 2016 14:35:45 -0400 Subject: Bug 499623: Do not run testLoadConfigurationExtended on Windows. Currently, test utility methods do not guarantee a folder can be made read-only and asserted using java.io.File.canWrite(). As a result extended configuration tests will not work correctly on Windows. Change-Id: I2e4f320587aea45c22a4b95b57f6817c3e8a09ff Signed-off-by: Roland Grunberg --- .../manipulator/SimpleConfiguratorManipulatorTests.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java index 4534acd77..1e22b03f5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java @@ -24,6 +24,7 @@ import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.equinox.p2.tests.reconciler.dropins.SharedInstallTests; +import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest; import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator; public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest { @@ -87,6 +88,11 @@ public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest } public void testLoadConfigurationExtended() throws Exception { + // See org.eclipse.equinox.p2.tests.simpleconfigurator.SimpleConfiguratorTests + if (AbstractSharedInstallTest.WINDOWS) { + return; + } + // installation info URI installArea = EquinoxUtils.getInstallLocationURI(TestActivator.getContext()); -- cgit v1.2.3