Disabled CVSWorkspaceSubscriberTest.testNestedMarkAsMerged failed (see bug 408932)I20130602-2000I20130601-1500I20130531-2000I20130530-1430

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
index 677c1c2d2..1d7493855 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
@@ -1277,6 +1277,10 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 	}
 	
 	public void testNestedMarkAsMerged() throws CoreException, InvocationTargetException, InterruptedException {
+		if (Util.isMac()) {
+			return; //TODO Disable test for Mac because of intermittent test failures, see https://bugs.eclipse.org/408932
+		}
+
 		// Create a project and checkout a copy
 		IProject project = createProject(new String[] { "file1.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
 		IProject copy = checkoutCopy(project, "-copy");
@@ -1302,8 +1306,9 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 	
 	public void testMarkAsMergedOnBinaryFile() throws TeamException, CoreException, InvocationTargetException, InterruptedException {
 		if(Util.isMac()){
-			return; //TODO Disable test for Mac because of intermittent test failures, see bug 399509
+			return; //TODO Disable test for Mac because of intermittent test failures, see https://bugs.eclipse.org/399509
 		}
+
 		// Create a project and checkout a copy
 		IProject project = createProject(new String[] { "file1.txt"});
 		IProject copy = checkoutCopy(project, "-copy");