You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/11/19 16:54:59 UTC
svn commit: r1204003 - in /lucene/dev/branches/branch_3x/lucene/src:
test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
test/org/apache/lucene/index/TestIndexWriterExceptions.java
test/org/apache/lucene/index/TestTransactions.java
Author: mikemccand
Date: Sat Nov 19 15:54:59 2011
New Revision: 1204003
URL: http://svn.apache.org/viewvc?rev=1204003&view=rev
Log:
port back new fangs in MockDirWrapper
Modified:
lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java
Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1204003&r1=1204002&r2=1204003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java Sat Nov 19 15:54:59 2011
@@ -160,8 +160,7 @@ public class MockDirectoryWrapper extend
@Override
public synchronized void sync(Collection<String> names) throws IOException {
maybeYield();
- for (String name : names)
- maybeThrowDeterministicException();
+ maybeThrowDeterministicException();
if (crashed)
throw new IOException("cannot sync after crash");
unSyncedFiles.removeAll(names);
@@ -356,9 +355,18 @@ public class MockDirectoryWrapper extend
return new HashSet<String>(openFilesDeleted);
}
+ private boolean failOnCreateOutput = true;
+
+ public void setFailOnCreateOutput(boolean v) {
+ failOnCreateOutput = v;
+ }
+
@Override
public synchronized IndexOutput createOutput(String name) throws IOException {
maybeYield();
+ if (failOnCreateOutput) {
+ maybeThrowDeterministicException();
+ }
if (crashed)
throw new IOException("cannot createOutput after crash");
init();
@@ -420,9 +428,18 @@ public class MockDirectoryWrapper extend
openFileHandles.put(c, new RuntimeException("unclosed Index" + (input ? "Input" : "Output") + ": " + name));
}
+ private boolean failOnOpenInput = true;
+
+ public void setFailOnOpenInput(boolean v) {
+ failOnOpenInput = v;
+ }
+
@Override
public synchronized IndexInput openInput(String name) throws IOException {
maybeYield();
+ if (failOnOpenInput) {
+ maybeThrowDeterministicException();
+ }
if (!delegate.fileExists(name))
throw new FileNotFoundException(name);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1204003&r1=1204002&r2=1204003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sat Nov 19 15:54:59 2011
@@ -839,6 +839,7 @@ public class TestIndexWriterExceptions e
// LUCENE-1214
public void testExceptionsDuringCommit() throws Throwable {
MockDirectoryWrapper dir = newDirectory();
+ dir.setFailOnCreateOutput(false);
FailOnlyInCommit failure = new FailOnlyInCommit();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java?rev=1204003&r1=1204002&r2=1204003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java Sat Nov 19 15:54:59 2011
@@ -207,6 +207,8 @@ public class TestTransactions extends Lu
dir2.setPreventDoubleWrite(false);
dir1.failOn(new RandomFailure());
dir2.failOn(new RandomFailure());
+ dir1.setFailOnOpenInput(false);
+ dir2.setFailOnOpenInput(false);
initIndex(dir1);
initIndex(dir2);