From 4a0eb79d34731dab9c112665ee3fbfb2c23f4de9 Mon Sep 17 00:00:00 2001 From: Markus Keller Date: Thu, 14 Nov 2013 15:06:15 +0100 Subject: Fixed bug 419838: Bug_217673.test runs very long and throws OOME often on Mac (now disabled) Signed-off-by: Markus Keller --- .../org/eclipse/team/tests/core/regression/Bug_217673.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java index 19a69cb70..82a66e173 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java @@ -18,11 +18,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourceAttributes; import org.eclipse.core.resources.ResourcesPlugin; - -import org.eclipse.jface.util.Util; - import org.eclipse.core.runtime.CoreException; - +import org.eclipse.core.runtime.IPath; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.tests.core.TeamTest; @@ -30,28 +27,27 @@ public class Bug_217673 extends TeamTest { public void test() throws CoreException { - // Disabled due to https://bugs.eclipse.org/419838 - if (Util.isMac()) - return; - IWorkspace workspace = ResourcesPlugin.getWorkspace(); final IProject project = workspace.getRoot().getProject( getUniqueString()); project.create(null); project.open(null); IResource resource = project.getFile(".project"); + IPath linkTarget = getRandomLocation(); try { RepositoryProvider.map(project, PessimisticRepositoryProvider.NATURE_ID); PessimisticRepositoryProvider.markWritableOnEdit = true; setReadOnly(resource, true); - project.getFolder("test").createLink(getTempDir(), IResource.NONE, + linkTarget.toFile().mkdir(); + project.getFolder("test").createLink(linkTarget, IResource.NONE, null); assertTrue(".project should no longer be read-only", !isReadOnly(resource)); } finally { PessimisticRepositoryProvider.markWritableOnEdit = false; RepositoryProvider.unmap(project); + linkTarget.toFile().delete(); } } -- cgit v1.2.3