Merge pull request #4324 from kiminuo/feature/2020-09-08-torTests

Use `IAsyncLifetime` in TorTests & LiveServerTests.
zkSNACKs · Sep 15, 2020 · 157b33d · 157b33d
2 parents 15ac1ed + 30a3e32
commit 157b33d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/WalletWasabi.Tests/IntegrationTests/LiveServerTests.cs b/WalletWasabi.Tests/IntegrationTests/LiveServerTests.cs
@@ -2,6 +2,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,18 +18,27 @@
 namespace WalletWasabi.Tests.IntegrationTests
 {
 	[Collection("LiveServerTests collection")]
-	public class LiveServerTests
+	public class LiveServerTests : IAsyncLifetime
 	{
 		public LiveServerTests(LiveServerTestsFixture liveServerTestsFixture)
 		{
 			LiveServerTestsFixture = liveServerTestsFixture;
+		}
 
+		public async Task InitializeAsync()
+		{
+			EndPoint endpoint = Global.Instance.TorSocks5Endpoint;
 			string dataDir = Path.GetFullPath(AppContext.BaseDirectory);
 			string torLogsFile = Global.Instance.TorLogsFile;
 
-			var torManager = new TorProcessManager(Global.Instance.TorSocks5Endpoint, dataDir, torLogsFile);
+			var torManager = new TorProcessManager(endpoint, dataDir, torLogsFile);
 			torManager.Start(ensureRunning: true);
-			Task.Delay(3000).GetAwaiter().GetResult();
+			await Task.Delay(3000);
+		}
+
+		public Task DisposeAsync()
+		{
+			return Task.CompletedTask;
 		}
 
 		private LiveServerTestsFixture LiveServerTestsFixture { get; }

diff --git a/WalletWasabi.Tests/IntegrationTests/TorTests.cs b/WalletWasabi.Tests/IntegrationTests/TorTests.cs
@@ -12,16 +12,22 @@
 namespace WalletWasabi.Tests.IntegrationTests
 {
 	// Tor must be running
-	public class TorTests
+	public class TorTests : IAsyncLifetime
 	{
-		public TorTests()
+		public async Task InitializeAsync()
 		{
+			EndPoint endpoint = Global.Instance.TorSocks5Endpoint;
 			string dataDir = Path.GetFullPath(AppContext.BaseDirectory);
 			string torLogsFile = Global.Instance.TorLogsFile;
 
-			var torManager = new TorProcessManager(Global.Instance.TorSocks5Endpoint, dataDir, torLogsFile);
+			var torManager = new TorProcessManager(endpoint, dataDir, torLogsFile);
 			torManager.Start(ensureRunning: true);
-			Task.Delay(3000).GetAwaiter().GetResult();
+			await Task.Delay(3000);
+		}
+
+		public Task DisposeAsync()
+		{
+			return Task.CompletedTask;
 		}
 
 		[Fact]