You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/05/29 16:01:38 UTC
svn commit: r1682474 - in /lucene/dev/branches/lucene6508:
lucene/core/src/test/org/apache/lucene/store/TestLock.java
solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
Author: rmuir
Date: Fri May 29 14:01:38 2015
New Revision: 1682474
URL: http://svn.apache.org/r1682474
Log:
LUCENE-6508: remove double-obtain tests, no longer possible
Modified:
lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/store/TestLock.java
lucene/dev/branches/lucene6508/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
Modified: lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/store/TestLock.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/store/TestLock.java?rev=1682474&r1=1682473&r2=1682474&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/store/TestLock.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/store/TestLock.java Fri May 29 14:01:38 2015
@@ -110,59 +110,4 @@ public class TestLock extends LuceneTest
}
directory.close();
}
-
- public void testSingleInstanceLockFactoryDoubleObtain() throws Exception {
- LockFactory lf = new SingleInstanceLockFactory();
- Directory dir = newFSDirectory(createTempDir(), lf);
- Lock lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- try {
- lock.obtain();
- fail("did not hit double-obtain failure");
- } catch (LockObtainFailedException lofe) {
- // expected
- }
- lock.close();
-
- lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- lock.close();
- dir.close();
- }
-
- public void testSimpleFSLockFactoryDoubleObtain() throws Exception {
- Directory dir = newFSDirectory(createTempDir(), SimpleFSLockFactory.INSTANCE);
- Lock lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- try {
- lock.obtain();
- fail("did not hit double-obtain failure");
- } catch (LockObtainFailedException lofe) {
- // expected
- }
- lock.close();
-
- lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- lock.close();
- dir.close();
- }
-
- public void testNativeFSLockFactoryDoubleObtain() throws Exception {
- Directory dir = newFSDirectory(createTempDir(), NativeFSLockFactory.INSTANCE);
- Lock lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- try {
- lock.obtain();
- fail("did not hit double-obtain failure");
- } catch (LockObtainFailedException lofe) {
- // expected
- }
- lock.close();
-
- lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- lock.close();
- dir.close();
- }
}
Modified: lucene/dev/branches/lucene6508/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java?rev=1682474&r1=1682473&r2=1682474&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java (original)
+++ lucene/dev/branches/lucene6508/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java Fri May 29 14:01:38 2015
@@ -88,25 +88,4 @@ public class HdfsLockFactoryTest extends
IOUtils.close(lock, lock2);
dir.close();
}
-
- public void testDoubleObtain() throws Exception {
- String uri = HdfsTestUtil.getURI(dfsCluster);
- Path lockPath = new Path(uri, "/basedir/lock");
- Configuration conf = HdfsTestUtil.getClientConfiguration(dfsCluster);
- HdfsDirectory dir = new HdfsDirectory(lockPath, conf);
- Lock lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- try {
- lock.obtain();
- fail("did not hit double-obtain failure");
- } catch (LockObtainFailedException lofe) {
- // expected
- }
- lock.close();
-
- lock = dir.makeLock("foo");
- assertTrue(lock.obtain());
- lock.close();
- dir.close();
- }
}