Permalink
Browse files

Merge branch 'cassandra-3.11' into trunk

  • Loading branch information...
iamaleksey committed Apr 30, 2018
2 parents 9fecf94 + b67d6fb commit 2fe4b9dc69a919cadd6f78e9a4e259e6740b127f
Showing with 3 additions and 3 deletions.
  1. +3 −3 test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -381,7 +381,7 @@ public void testOpeningSSTable() throws Exception
long bloomModified = Files.getLastModifiedTime(bloomPath).toMillis();
long summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();
Thread.sleep(TimeUnit.MILLISECONDS.toMillis(1000)); // sleep to ensure modified time will be different
TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different
// Offline tests
// check that bloomfilter/summary ARE NOT regenerated
@@ -428,7 +428,7 @@ public void testOpeningSSTable() throws Exception
summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();
summaryFile.delete();
Thread.sleep(TimeUnit.MILLISECONDS.toMillis(1000)); // sleep to ensure modified time will be different
TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different
bloomModified = Files.getLastModifiedTime(bloomPath).toMillis();
target = SSTableReader.open(desc, components, store.metadata);
@@ -445,7 +445,7 @@ public void testOpeningSSTable() throws Exception
summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();
target = SSTableReader.open(desc, components, store.metadata, false, false);
Thread.sleep(TimeUnit.MILLISECONDS.toMillis(10)); // sleep to ensure modified time will be different
TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different
assertEquals(bloomModified, Files.getLastModifiedTime(bloomPath).toMillis());
assertEquals(summaryModified, Files.getLastModifiedTime(summaryPath).toMillis());

0 comments on commit 2fe4b9d

Please sign in to comment.