CI Test coverage need longer timeouts (#3124)

* Increase timeout to 2s in test for code coverage on CI * fix BlockProcessorTests
NethermindEth · Jun 15, 2021 · b8ab965 · b8ab965
1 parent 8e0e6a8
commit b8ab965
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs
@@ -39,6 +39,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using FluentAssertions;
+using Nethermind.Core.Test.Blockchain;
 
 namespace Nethermind.Blockchain.Test
 {
@@ -171,7 +172,7 @@ public async Task Process_long_running_branch(int blocksAmount)
 
             var branchLength = blocksAmount + (int)testRpc.BlockTree.BestKnownNumber + 1;
             ((BlockTree)testRpc.BlockTree).AddBranch(branchLength, (int)testRpc.BlockTree.BestKnownNumber);
-            (await suggestedBlockResetEvent.WaitAsync(1000)).Should().BeTrue();
+            (await suggestedBlockResetEvent.WaitAsync(TestBlockchain.DefaultTimeout)).Should().BeTrue();
             Assert.AreEqual(branchLength - 1, (int)testRpc.BlockTree.BestKnownNumber);
         }
     }

diff --git a/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs b/src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs
@@ -52,6 +52,7 @@ namespace Nethermind.Core.Test.Blockchain
 {
     public class TestBlockchain : IDisposable
     {
+        public const int DefaultTimeout = 2000;
         public IStateReader StateReader { get; private set; }
         public IEthereumEcdsa EthereumEcdsa { get; private set; }
         public TransactionProcessor TxProcessor { get; set; }
@@ -177,15 +178,15 @@ protected virtual async Task<TestBlockchain> Build(ISpecProvider specProvider =
             return this;
         }
 
-        private async Task WaitAsync(SemaphoreSlim semaphore, string error, int timeout = 1000)
+        private async Task WaitAsync(SemaphoreSlim semaphore, string error, int timeout = DefaultTimeout)
         {
             if (!await semaphore.WaitAsync(timeout))
             {
                 throw new InvalidOperationException(error);
             }
         }
 
-        private async Task WaitAsync(EventWaitHandle eventWaitHandle, string error, int timeout = 1000)
+        private async Task WaitAsync(EventWaitHandle eventWaitHandle, string error, int timeout = DefaultTimeout)
         {
             if (!await eventWaitHandle.WaitOneAsync(timeout, CancellationToken.None))
             {