Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-10-22 19:22:28 +0000
committerMichael Valenta2005-10-22 19:22:28 +0000
commit9e7d02e4885e8db68d6eaac6eaa33fe486d2775a (patch)
treea2824caf10078b99536e759feb90d2b56dbe8a8f
parent6e6e267b8f5706f95ca538cf24d72219352e1db8 (diff)
downloadeclipse.platform.team-branch_20050711_LogicalModelSupport.tar.gz
eclipse.platform.team-branch_20050711_LogicalModelSupport.tar.xz
eclipse.platform.team-branch_20050711_LogicalModelSupport.zip
Fix for test failures during buildbranch_20050711_LogicalModelSupport
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index 1c9a3927d..3bdf040fe 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -844,12 +844,17 @@ public class EclipseTest extends ResourceTest {
protected void setContentsAndEnsureModified(IFile file, InputStream stream) throws CoreException, CVSException {
ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor(file);
int count = 0;
+ file.setContents(stream, false, false, null);
do {
- file.setContents(stream, false, false, null);
assertTrue("Timestamp granularity is too small. Increase test wait factor", count <= CVSTestSetup.WAIT_FACTOR);
if (!cvsFile.isModified(null)) {
waitMsec(1500);
count++;
+ try {
+ file.setContents(new ByteArrayInputStream(getFileContents(file).getBytes()), false, false, null);
+ } catch (IOException e) {
+ throw new CVSException("Error reading file contents", e);
+ }
}
} while (!cvsFile.isModified(null));
}

Back to the top