diff options
author | Andrey Loskutov | 2019-03-03 21:59:46 +0000 |
---|---|---|
committer | Andrey Loskutov | 2019-03-03 21:59:46 +0000 |
commit | 18265b87041099023cffa5d352d82a65a496fc97 (patch) | |
tree | b58d2a39c4c2a049e96fca5436dd5e599e158f6d | |
parent | 5cd00dea0b2639f1fd0b054482e73f559f807847 (diff) | |
download | rt.equinox.p2-18265b87041099023cffa5d352d82a65a496fc97.tar.gz rt.equinox.p2-18265b87041099023cffa5d352d82a65a496fc97.tar.xz rt.equinox.p2-18265b87041099023cffa5d352d82a65a496fc97.zip |
Bug 540069 - disable tests for posix related code on WindowsY20190320-2200Y20190319-2305Y20190316-1220Y20190313-2200Y20190313-0215Y20190308-0715Y20190307-1015Y20190306-2200S4_11_0_RC2R4_11I20190307-0500I20190306-2135I20190306-1800I20190306-0600I20190305-1800I20190305-0600I20190304-1800I20190304-0600I20190303-1800R4_11_maintenance
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>
-rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java | 9 |
1 files changed, 9 insertions, 0 deletions
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 7cecf5db2..b3c96083a 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.nio.file.attribute.FileTime; 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 @@ public class SimpleConfiguratorTest extends AbstractProvisioningTest { // 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 @@ public class SimpleConfiguratorTest extends AbstractProvisioningTest { // 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); |