Raise one timeout from 5 seconds to 20 seconds.

alanmcgovern · alanmcgovern · commit f88dfa02afe1 · 2024-08-25T00:55:02.000+01:00
Some CI is just slower than others.

The ConnectionPair has been configured to time out and dispose
connections after 5 seconds. After making some of the test execution in
CI happen in parallel it has begun triggering. Urgh.
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/DownloadModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/DownloadModeTests.cs
@@ -59,7 +59,7 @@ public class DownloadModeTests
         [SetUp]
         public void Setup ()
         {
-            conn = new ConnectionPair ().WithTimeout ();
+            conn = new ConnectionPair ().DisposeAfterTimeout ();
             Settings = new EngineSettings ();
             PieceWriter = new TestWriter ();
             DiskManager = new DiskManager (Settings, Factories.Default, PieceWriter);
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/HashingModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/HashingModeTests.cs
@@ -56,7 +56,7 @@ public class HashingModeTests
         public void Setup ()
         {
             TempDirectory = TempDir.Create ();
-            conn = new ConnectionPair ().WithTimeout ();
+            conn = new ConnectionPair ().DisposeAfterTimeout ();
             PieceWriter = new TestWriter ();
             TrackerManager = new ManualTrackerManager ();
 
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/MetadataModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/MetadataModeTests.cs
@@ -37,6 +37,7 @@
 using System.Threading.Tasks;
 
 using MonoTorrent.Connections.Peer.Encryption;
+using MonoTorrent.Logging;
 using MonoTorrent.Messages.Peer;
 using MonoTorrent.Messages.Peer.FastPeer;
 using MonoTorrent.Messages.Peer.Libtorrent;
@@ -56,7 +57,8 @@ public class MetadataModeTests
 
         public async Task Setup (bool metadataMode, bool multiFile = false, bool metadataOnly = false)
         {
-            pair = new ConnectionPair ().WithTimeout ();
+            LoggerFactory.Register (new TextWriterLogger (TestContext.Out));
+            pair = new ConnectionPair ().DisposeAfterTimeout ();
             rig = multiFile ? TestRig.CreateMultiFile (32768, metadataMode) : TestRig.CreateSingleFile (Constants.BlockSize * 27, Constants.BlockSize * 2, metadataMode);
             rig.RecreateManager ().Wait ();
 
@@ -80,6 +82,7 @@ public async Task Teardown ()
             await rig.Manager.StopAsync ();
             pair.Dispose ();
             rig.Dispose ();
+            LoggerFactory.Register (null);
         }
 
         [Test]
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StartingModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StartingModeTests.cs
@@ -52,7 +52,7 @@ public class StartingModeTests
         [SetUp]
         public void Setup ()
         {
-            conn = new ConnectionPair ().WithTimeout ();
+            conn = new ConnectionPair ().DisposeAfterTimeout ();
             Settings = new EngineSettings ();
             PieceWriter = new TestWriter ();
             DiskManager = new DiskManager (Settings, Factories.Default, PieceWriter);
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StoppedModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StoppedModeTests.cs
@@ -51,7 +51,7 @@ public class StoppedModeTests
         [SetUp]
         public void Setup ()
         {
-            conn = new ConnectionPair ().WithTimeout ();
+            conn = new ConnectionPair ().DisposeAfterTimeout ();
             Settings = new EngineSettings ();
             DiskManager = new DiskManager (Settings, Factories.Default, new NullWriter ());
             ConnectionManager = new ConnectionManager ("LocalPeerId", Settings, Factories.Default, DiskManager);
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StoppingModeTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client.Modes/StoppingModeTests.cs
@@ -52,7 +52,7 @@ public class StoppingModeTests
         [SetUp]
         public void Setup ()
         {
-            conn = new ConnectionPair ().WithTimeout ();
+            conn = new ConnectionPair ().DisposeAfterTimeout ();
             Settings = new EngineSettings ();
             DiskManager = new DiskManager (Settings, Factories.Default, new NullWriter ());
             ConnectionManager = new ConnectionManager ("LocalPeerId", Settings, Factories.Default, DiskManager);
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/EncryptorFactoryTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/EncryptorFactoryTests.cs
@@ -58,7 +58,7 @@ public class EncryptorFactoryTests
         [SetUp]
         public void Setup ()
         {
-            pair = new ConnectionPair ().WithTimeout ();
+            pair = new ConnectionPair ().DisposeAfterTimeout ();
 
             InfoHash = new InfoHash (Enumerable.Repeat ((byte) 255, 20).ToArray ());
             SKeys = new[] {
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/NetworkIOTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/NetworkIOTests.cs
@@ -52,7 +52,7 @@ public class NetworkIOTests
         [SetUp]
         public void Setup ()
         {
-            pair = new ConnectionPair ().WithTimeout ();
+            pair = new ConnectionPair ().DisposeAfterTimeout ();
         }
 
         [TearDown]
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/PeerIOTests.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/PeerIOTests.cs
@@ -46,7 +46,7 @@ public class PeerIOTests
         [SetUp]
         public void Setup ()
         {
-            pair = new ConnectionPair ().WithTimeout ();
+            pair = new ConnectionPair ().DisposeAfterTimeout ();
         }
 
         [TearDown]
diff --git a/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/TestRig.cs b/src/Tests/Tests.MonoTorrent.Client/MonoTorrent.Client/TestRig.cs
@@ -317,8 +317,6 @@ public void Add (TorrentManager manager, IPeerConnection connection)
 
     public class ConnectionPair : IDisposable
     {
-        static readonly TimeSpan Timeout = System.Diagnostics.Debugger.IsAttached ? TimeSpan.FromHours (1) : TimeSpan.FromSeconds (5);
-
         IDisposable CancellationRegistration { get; set; }
 
         public CustomConnection Incoming { get; }
@@ -339,9 +337,9 @@ public void Dispose ()
             Outgoing.Dispose ();
         }
 
-        public ConnectionPair WithTimeout ()
+        public ConnectionPair DisposeAfterTimeout ()
         {
-            CancellationTokenSource cancellation = new CancellationTokenSource (Timeout);
+            CancellationTokenSource cancellation = new CancellationTokenSource (TaskExtensions.Timeout);
             CancellationRegistration = cancellation.Token.Register (Dispose);
             return this;
         }
diff --git a/src/Tests/Tests.MonoTorrent.Client/TaskExtensions.cs b/src/Tests/Tests.MonoTorrent.Client/TaskExtensions.cs
@@ -41,7 +41,7 @@ namespace MonoTorrent
 {
     static class TaskExtensions
     {
-        static readonly TimeSpan Timeout = System.Diagnostics.Debugger.IsAttached ? TimeSpan.FromHours (1) : TimeSpan.FromSeconds (15);
+        internal static readonly TimeSpan Timeout = System.Diagnostics.Debugger.IsAttached ? TimeSpan.FromHours (1) : TimeSpan.FromSeconds (20);
 
         public static T TakeWithTimeout<T> (this BlockingCollection<T> collection, string message = null)
         {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class DownloadModeTests`
`59`	`59`	`[SetUp]`
`60`	`60`	`public void Setup ()`
`61`	`61`	`{`
`62`		`- conn = new ConnectionPair ().WithTimeout ();`
	`62`	`+ conn = new ConnectionPair ().DisposeAfterTimeout ();`
`63`	`63`	`Settings = new EngineSettings ();`
`64`	`64`	`PieceWriter = new TestWriter ();`
`65`	`65`	`DiskManager = new DiskManager (Settings, Factories.Default, PieceWriter);`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class HashingModeTests`
`56`	`56`	`public void Setup ()`
`57`	`57`	`{`
`58`	`58`	`TempDirectory = TempDir.Create ();`
`59`		`- conn = new ConnectionPair ().WithTimeout ();`
	`59`	`+ conn = new ConnectionPair ().DisposeAfterTimeout ();`
`60`	`60`	`PieceWriter = new TestWriter ();`
`61`	`61`	`TrackerManager = new ManualTrackerManager ();`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class StartingModeTests`
`52`	`52`	`[SetUp]`
`53`	`53`	`public void Setup ()`
`54`	`54`	`{`
`55`		`- conn = new ConnectionPair ().WithTimeout ();`
	`55`	`+ conn = new ConnectionPair ().DisposeAfterTimeout ();`
`56`	`56`	`Settings = new EngineSettings ();`
`57`	`57`	`PieceWriter = new TestWriter ();`
`58`	`58`	`DiskManager = new DiskManager (Settings, Factories.Default, PieceWriter);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class StoppedModeTests`
`51`	`51`	`[SetUp]`
`52`	`52`	`public void Setup ()`
`53`	`53`	`{`
`54`		`- conn = new ConnectionPair ().WithTimeout ();`
	`54`	`+ conn = new ConnectionPair ().DisposeAfterTimeout ();`
`55`	`55`	`Settings = new EngineSettings ();`
`56`	`56`	`DiskManager = new DiskManager (Settings, Factories.Default, new NullWriter ());`
`57`	`57`	`ConnectionManager = new ConnectionManager ("LocalPeerId", Settings, Factories.Default, DiskManager);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class StoppingModeTests`
`52`	`52`	`[SetUp]`
`53`	`53`	`public void Setup ()`
`54`	`54`	`{`
`55`		`- conn = new ConnectionPair ().WithTimeout ();`
	`55`	`+ conn = new ConnectionPair ().DisposeAfterTimeout ();`
`56`	`56`	`Settings = new EngineSettings ();`
`57`	`57`	`DiskManager = new DiskManager (Settings, Factories.Default, new NullWriter ());`
`58`	`58`	`ConnectionManager = new ConnectionManager ("LocalPeerId", Settings, Factories.Default, DiskManager);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public class EncryptorFactoryTests`
`58`	`58`	`[SetUp]`
`59`	`59`	`public void Setup ()`
`60`	`60`	`{`
`61`		`- pair = new ConnectionPair ().WithTimeout ();`
	`61`	`+ pair = new ConnectionPair ().DisposeAfterTimeout ();`
`62`	`62`
`63`	`63`	`InfoHash = new InfoHash (Enumerable.Repeat ((byte) 255, 20).ToArray ());`
`64`	`64`	`SKeys = new[] {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class NetworkIOTests`
`52`	`52`	`[SetUp]`
`53`	`53`	`public void Setup ()`
`54`	`54`	`{`
`55`		`- pair = new ConnectionPair ().WithTimeout ();`
	`55`	`+ pair = new ConnectionPair ().DisposeAfterTimeout ();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`[TearDown]`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class PeerIOTests`
`46`	`46`	`[SetUp]`
`47`	`47`	`public void Setup ()`
`48`	`48`	`{`
`49`		`- pair = new ConnectionPair ().WithTimeout ();`
	`49`	`+ pair = new ConnectionPair ().DisposeAfterTimeout ();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`[TearDown]`
Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,6 @@ public void Add (TorrentManager manager, IPeerConnection connection)`
`317`	`317`
`318`	`318`	`public class ConnectionPair : IDisposable`
`319`	`319`	`{`
`320`		`- static readonly TimeSpan Timeout = System.Diagnostics.Debugger.IsAttached ? TimeSpan.FromHours (1) : TimeSpan.FromSeconds (5);`
`321`		`-`
`322`	`320`	`IDisposable CancellationRegistration { get; set; }`
`323`	`321`
`324`	`322`	`public CustomConnection Incoming { get; }`
`@@ -339,9 +337,9 @@ public void Dispose ()`
`339`	`337`	`Outgoing.Dispose ();`
`340`	`338`	`}`
`341`	`339`
`342`		`- public ConnectionPair WithTimeout ()`
	`340`	`+ public ConnectionPair DisposeAfterTimeout ()`
`343`	`341`	`{`
`344`		`- CancellationTokenSource cancellation = new CancellationTokenSource (Timeout);`
	`342`	`+ CancellationTokenSource cancellation = new CancellationTokenSource (TaskExtensions.Timeout);`
`345`	`343`	`CancellationRegistration = cancellation.Token.Register (Dispose);`
`346`	`344`	`return this;`
`347`	`345`	`}`