diff options
author | Dani Megert | 2013-08-08 08:05:45 +0000 |
---|---|---|
committer | Dani Megert | 2013-08-08 08:05:45 +0000 |
commit | 5ae962b9c5a39026612bf021ecb239b9c327f960 (patch) | |
tree | 66495d83633c479c207c47484b7f91c20d01b0ef /tests | |
parent | f743d2de7592e078b2fd7b49dc80a884c6106536 (diff) | |
download | eclipse.platform.team-5ae962b9c5a39026612bf021ecb239b9c327f960.tar.gz eclipse.platform.team-5ae962b9c5a39026612bf021ecb239b9c327f960.tar.xz eclipse.platform.team-5ae962b9c5a39026612bf021ecb239b9c327f960.zip |
Disabled unstable #testCommit on Mac OS X (see bug 399375)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java index 5a04d8d69..d032c718b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java @@ -25,6 +25,7 @@ import java.util.Set; import junit.framework.Test; import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping; + import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -33,10 +34,14 @@ import org.eclipse.core.resources.mapping.RemoteResourceMappingContext; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.resources.mapping.ResourceMappingContext; import org.eclipse.core.resources.mapping.ResourceTraversal; + +import org.eclipse.jface.util.Util; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; + import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.TeamStatus; @@ -184,7 +189,7 @@ public class ResourceMapperTests extends EclipseTest { * Need to ensure that only the resources contained in the mapping * have the branch tag associated with them. */ - private void assertBranched(ResourceMapping mapping, CVSTag branch) throws CoreException, IOException { + private void assertBranched(ResourceMapping mapping, CVSTag branch) throws CoreException { // First, make sure the proper resources are tagged in the repo assertTagged(mapping, branch); // Now make sure the proper local files are tagged @@ -580,6 +585,9 @@ public class ResourceMapperTests extends EclipseTest { } public void testCommit() throws Exception { + if (IS_UNSTABLE && Util.isMac()) + return; + // Create a test project, import it into cvs and check it out IProject project = createProject("testCommit", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder1/subfolder1/c.txt" }); |