Fix tests, add retry mechanism for server delete (intermittent failur…

…es due to deadlocks)

.circleci/config.yml

@@ -14,7 +14,7 @@ jobs:
             dotnet build --configuration release src/
   test:
     docker:
-      - image: mcr.microsoft.com/dotnet/core/sdk:3.1
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
     steps:
       - checkout
       - run:

.vscode/tasks.json

@@ -1,16 +1,21 @@
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "dotnet",
-    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "taskName": "build",
+            "label": "build",
+            "type": "shell",
+            "command": "dotnet",
             "args": [
+                "build",
                 "${workspaceRoot}/src/Postmark.Tests/Postmark.Tests.csproj"
             ],
-            "isBuildCommand": true,
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
         }
     ]
 }

src/Postmark.Tests/ClientBounceTests.cs

@@ -8,7 +8,7 @@ public class ClientBounceTests : ClientBaseFixture
     {
         public ClientBounceTests()
         {
-            Client = new PostmarkClient(WriteTestServerToken, BaseUrl);
+            Client = new PostmarkClient(ReadSeleniumTestServerToken, BaseUrl);
         }
 
         [Fact]

src/Postmark.Tests/Postmark.Tests.csproj

@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <ApplicationIcon/>
+        <TargetFramework>net6.0</TargetFramework>
         <OutputTypeEx>library</OutputTypeEx>
-        <StartupObject/>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>

src/Postmark/PostmarkAdminClient.cs

@@ -53,7 +53,23 @@ public async Task<PostmarkServer> GetServerAsync(int serverId)
         /// <returns></returns>
         public async Task<PostmarkResponse> DeleteServerAsync(int serverId)
         {
-            return await this.ProcessNoBodyRequestAsync<PostmarkResponse>("/servers/" + serverId, verb: HttpMethod.Delete);
+            // Adding a retry mechanism because server deletion currently fails intermittently due to deadlocks.
+            // This is a temporary fix, and should be removed once the server delete operation is more reliable.
+            var attemptsRemain = 5;
+            while (true)
+            {
+                try
+                {
+                    return await this.ProcessNoBodyRequestAsync<PostmarkResponse>("/servers/" + serverId, verb: HttpMethod.Delete);
+                }
+                catch
+                {
+                    if (--attemptsRemain == 0)
+                    {
+                        throw;
+                    }
+                }
+            }
         }
 
         /// <summary>

src/Postmark/PostmarkClientBase.cs

@@ -123,8 +123,10 @@ protected async Task<TResponse> ProcessRequestAsync<TRequestBody, TResponse>(
         /// <param name="parameters"></param>
         /// <param name="verb">The http verb to use for the request.</param>
         /// <returns></returns>
-        protected async Task<TResponse> ProcessNoBodyRequestAsync<TResponse>
-            (string apiPath, IDictionary<string, object> parameters = null, HttpMethod verb = null)
+        protected async Task<TResponse> ProcessNoBodyRequestAsync<TResponse>(
+            string apiPath,
+            IDictionary<string, object> parameters = null,
+            HttpMethod verb = null)
         {
             parameters = parameters ?? new Dictionary<string, object>();