From db341527949fe98e56a0a463f74c55398f005a45 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Wed, 23 Jan 2013 07:55:13 +0100 Subject: [PATCH] Attempt to stabilize FileTreeIterator test on Windows My guess is that the higher resolution of timestamps provided by Java on Windows causes this test to occasionally fail. Bug: 396662 Change-Id: Ia10d76e95fe6156c7ad05972619160e461606805 --- .../tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java index bf22569df..a416c742f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java @@ -253,14 +253,16 @@ public class FileTreeIteratorTest extends RepositoryTestCase { // Hopefully fsTick will make sure our entry gets smudged fsTick(f); writeTrashFile("file", "content"); + long lastModified = f.lastModified(); git.add().addFilepattern("file").call(); writeTrashFile("file", "conten2"); + f.setLastModified(lastModified); DirCacheEntry dce = db.readDirCache().getEntry("file"); FileTreeIterator fti = new FileTreeIterator(trash, db.getFS(), db .getConfig().get(WorkingTreeOptions.KEY)); while (!fti.getEntryPathString().equals("file")) fti.next(1); - // If the fsTick trick does not work we could skip the compareMetaData + // If the rounding trick does not work we could skip the compareMetaData // test and hope that we are usually testing the intended code path. assertEquals(MetadataDiff.SMUDGED, fti.compareMetadata(dce)); assertTrue(fti.isModified(dce, false));