Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2020-02-22 06:19:16 -0500
committerEd Merks2020-02-22 06:19:16 -0500
commit9b852358965961b4cd9bf174920d3f92e5e968be (patch)
tree84a404d103ecff4c507b00285e96fd344a5e87bf
parente106d1748390fa8eceea9d6115444fe9a95da58a (diff)
downloadrt.equinox.p2-X20200222-0700.tar.gz
rt.equinox.p2-X20200222-0700.tar.xz
rt.equinox.p2-X20200222-0700.zip
Bug 560413 - ChmodActionTest.testExecuteUndo() fails on WindowsX20200222-0700
Change-Id: I3dc5e7989d8782187872d9d0d965efd613a1ebf3 Signed-off-by: Ed Merks <ed.merks@gmail.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java
index 9444fd1f7..075bd0e19 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/ChmodActionTest.java
@@ -15,8 +15,11 @@
package org.eclipse.equinox.p2.tests.touchpoint.natives;
import java.io.File;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.equinox.internal.p2.touchpoint.natives.NativeTouchpoint;
import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.ActionConstants;
import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.ChmodAction;
@@ -92,7 +95,9 @@ public class ChmodActionTest extends AbstractProvisioningTest {
xparameters = Collections.unmodifiableMap(parameters);
IStatus result = action.execute(xparameters);
- assertFalse("Missing file should result in error", result.isOK());
+ assertFalse(
+ "Missing file should result in error, except on Windows where ChmodAction is a no-op",
+ !Platform.getOS().equals(Platform.OS_WIN32) && result.isOK());
action.undo(xparameters);
}

Back to the top