avoid wrapper thread

Author: deansheather

Tests.Vpn.Service/TestHttpServer.cs

@@ -13,7 +13,7 @@ public class TestHttpServer : IDisposable
     private readonly CancellationTokenSource _cts = new();
     private readonly Func<HttpListenerContext, Task> _handler;
     private readonly HttpListener _listener;
-    private readonly Thread _listenerThread;
+    private readonly Task _listenerTask;
 
     public string BaseUrl { get; private set; }
 
@@ -60,12 +60,7 @@ public TestHttpServer(Func<HttpListenerContext, Task> handler)
             throw new InvalidOperationException("Could not find a free port to listen on");
         BaseUrl = $"http://localhost:{port}";
 
-        _listenerThread = new Thread(() =>
-        {
-            RequestLoop().GetAwaiter().GetResult();
-        });
-
-        _listenerThread.Start();
+        _listenerTask = RequestLoop();
     }
 
     public void Dispose()
@@ -74,15 +69,11 @@ public void Dispose()
         _listener.Stop();
         try
         {
-            _listenerThread.Join();
-        }
-        catch (ThreadStateException)
-        {
-            // Ignore if the listener thread is already dead
+            _listenerTask.GetAwaiter().GetResult();
         }
-        catch (ThreadInterruptedException)
+        catch (TaskCanceledException)
         {
-            // Ignore interrupted listener thread, it's now closed anyway
+            // Ignore
         }
         GC.SuppressFinalize(this);
     }
@@ -106,11 +97,6 @@ private async Task RequestLoop()
                 // it's stopped
                 break;
             }
-            catch (TaskCanceledException)
-            {
-                // Ignore, the CTS was cancelled
-                break;
-            }
     }
 
     private async Task HandleRequest(HttpListenerContext context)