This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 3144ba76a7866526533ee8b89e5cf26207a18ca6 Author: Shad Storhaug <[email protected]> AuthorDate: Sun Oct 10 06:44:10 2021 +0700 Removed [Deadlock] attribute from tests that were deadlocking due to extra Thread.Sleep(0) call in IndexWriter.Dispose(). --- .../SimpleText/TestSimpleTextStoredFieldsFormat.cs | 1 - src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 1 - src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 6 ++---- src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs | 1 - src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs | 1 - src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs | 1 - src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs | 1 - 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextStoredFieldsFormat.cs b/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextStoredFieldsFormat.cs index 5f44527..2f3a765 100644 --- a/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextStoredFieldsFormat.cs +++ b/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextStoredFieldsFormat.cs @@ -30,7 +30,6 @@ namespace Lucene.Net.Codecs.SimpleText } - [Deadlock][Timeout(600000)] public override void TestConcurrentReads() { base.TestConcurrentReads(); diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs index 526d1b9..a44c384 100644 --- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs +++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs @@ -972,7 +972,6 @@ namespace Lucene.Net.Index // LUCENE-1335: test simultaneous addIndexes & close [Test] [Slow] - [Deadlock][Timeout(600000)] public virtual void TestAddIndexesWithCloseNoWait() { const int NUM_COPY = 50; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 22f2baa..05f1b09 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -1438,8 +1438,7 @@ namespace Lucene.Net.Index [Test] [Slow] - [AwaitsFix(BugUrl = "https://github.com/apache/lucenenet/issues/269";)] // LUCENENET TODO: this test occasionally fails - [Deadlock][Timeout(900000)] // LUCENENET TODO: this test occasionally deadlocks + [AwaitsFix(BugUrl = "https://github.com/apache/lucenenet/issues/269";)] // LUCENENET TODO: this test occasionally fails on .NET Core public virtual void TestThreadInterruptDeadlock() { IndexerThreadInterrupt t = new IndexerThreadInterrupt(this); @@ -1480,8 +1479,7 @@ namespace Lucene.Net.Index /// testThreadInterruptDeadlock but with 2 indexer threads </summary> [Test] [Slow] - [AwaitsFix(BugUrl = "https://github.com/apache/lucenenet/issues/269";)] // LUCENENET TODO: this test occasionally fails - [Deadlock][Timeout(900000)] // LUCENENET TODO: this test occasionally deadlocks + [AwaitsFix(BugUrl = "https://github.com/apache/lucenenet/issues/269";)] // LUCENENET TODO: this test occasionally fails on .NET Core public virtual void TestTwoThreadsInterruptDeadlock() { IndexerThreadInterrupt t1 = new IndexerThreadInterrupt(this); diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs index 5d774c3..7481bb2 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs @@ -69,7 +69,6 @@ namespace Lucene.Net.Index using TokenStream = Lucene.Net.Analysis.TokenStream; [TestFixture] - [Deadlock][Timeout(600000)] public class TestIndexWriterExceptions : LuceneTestCase { private class DocCopyIterator : IEnumerable<Document> diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs index da3a07f..b000cf5 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs @@ -52,7 +52,6 @@ namespace Lucene.Net.Index using TopDocs = Lucene.Net.Search.TopDocs; [TestFixture] - [Deadlock][Timeout(600000)] public class TestIndexWriterReader : LuceneTestCase { private readonly int numThreads = TestNightly ? 5 : 3; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs index 11c2d95..f9b0a71 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs @@ -55,7 +55,6 @@ namespace Lucene.Net.Index /// </summary> [SuppressCodecs("Lucene3x")] [Slow] - [Deadlock][Timeout(1200000)] [TestFixture] public class TestIndexWriterWithThreads : LuceneTestCase { diff --git a/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs index 183f87e..b07e0fe 100644 --- a/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs @@ -39,7 +39,6 @@ namespace Lucene.Net.Index [Test] [Slow] // (occasionally) - [Deadlock][Timeout(600000)] public virtual void TestIndexing() { Directory mainDir = NewDirectory();
