Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMalgorzata Janczarska2013-01-30 17:28:48 +0000
committerMalgorzata Janczarska2013-01-30 18:07:17 +0000
commit112b7c506352d59def2ebd6f26f1615b056da14a (patch)
treed6c8f31db293ac8b6821962216110089eaa81756 /tests
parent64cced48f2fd20e0bfaa523a9b64dff7e80d7f12 (diff)
downloadeclipse.platform.team-112b7c506352d59def2ebd6f26f1615b056da14a.tar.gz
eclipse.platform.team-112b7c506352d59def2ebd6f26f1615b056da14a.tar.xz
eclipse.platform.team-112b7c506352d59def2ebd6f26f1615b056da14a.zip
Bug 399509 - Intermittent test failurev20130130-180717I20130130-2000
CVSWorkspaceSubscriberTest.testMarkAsMergedOnBinaryFile on Mac - disable failing test
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java4
1 files changed, 4 insertions, 0 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 f7e74907b..ed3efe142 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
@@ -31,6 +31,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.util.Util;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.ISubscriberChangeEvent;
@@ -1300,6 +1301,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
+ }
// Create a project and checkout a copy
IProject project = createProject(new String[] { "file1.txt"});
IProject copy = checkoutCopy(project, "-copy");

Back to the top