Merge remote-tracking branch 'origin/dependabot/nuget/WireMock.Net-2.6.0' into dependabot/combined-updates

# Conflicts:
#	Directory.Packages.props

Author: brendandburns

Directory.Packages.props

@@ -26,7 +26,7 @@
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
     <PackageVersion Include="System.Text.Json" Version="10.0.9" />
     <PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="18.0.0" />
-    <PackageVersion Include="Wiremock.Net" Version="1.12.0" />
+    <PackageVersion Include="Wiremock.Net" Version="2.6.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="Xunit.StaFact" Version="3.0.13" />

tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs

@@ -1,6 +1,7 @@
 using k8s.LeaderElection;
 using Moq;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -84,8 +85,8 @@ public void SimpleLeaderElection()
         [Fact]
         public void LeaderElection()
         {
-            var electionHistory = new List<string>();
-            var leadershipHistory = new List<string>();
+            var electionHistory = new ConcurrentQueue<string>();
+            var leadershipHistory = new ConcurrentQueue<string>();
             var electionHistoryCountdown = new CountdownEvent(7);
 
             var renewCountA = 3;
@@ -95,19 +96,19 @@ public void LeaderElection()
             {
                 renewCountA--;
 
-                electionHistory.Add("A creates record");
-                leadershipHistory.Add("A gets leadership");
+                electionHistory.Enqueue("A creates record");
+                leadershipHistory.Enqueue("A gets leadership");
                 electionHistoryCountdown.Signal();
             };
 
             mockLockA.OnUpdate += (_) =>
             {
                 renewCountA--;
-                electionHistory.Add("A updates record");
+                electionHistory.Enqueue("A updates record");
                 electionHistoryCountdown.Signal();
             };
 
-            mockLockA.OnChange += (_) => { leadershipHistory.Add("A gets leadership"); };
+            mockLockA.OnChange += (_) => { leadershipHistory.Enqueue("A gets leadership"); };
 
             var leaderElectionConfigA = new LeaderElectionConfig(mockLockA)
             {
@@ -123,19 +124,19 @@ public void LeaderElection()
             {
                 renewCountB--;
 
-                electionHistory.Add("B creates record");
+                electionHistory.Enqueue("B creates record");
                 electionHistoryCountdown.Signal();
-                leadershipHistory.Add("B gets leadership");
+                leadershipHistory.Enqueue("B gets leadership");
             };
 
             mockLockB.OnUpdate += (_) =>
             {
                 renewCountB--;
-                electionHistory.Add("B updates record");
+                electionHistory.Enqueue("B updates record");
                 electionHistoryCountdown.Signal();
             };
 
-            mockLockB.OnChange += (_) => { leadershipHistory.Add("B gets leadership"); };
+            mockLockB.OnChange += (_) => { leadershipHistory.Enqueue("B gets leadership"); };
 
             var leaderElectionConfigB = new LeaderElectionConfig(mockLockB)
             {
@@ -153,13 +154,13 @@ public void LeaderElection()
 
                 leaderElector.OnStartedLeading += () =>
                 {
-                    leadershipHistory.Add("A starts leading");
+                    leadershipHistory.Enqueue("A starts leading");
                     testLeaderElectionLatch.Signal();
                 };
 
                 leaderElector.OnStoppedLeading += () =>
                 {
-                    leadershipHistory.Add("A stops leading");
+                    leadershipHistory.Enqueue("A stops leading");
                     testLeaderElectionLatch.Signal();
                     lockAStopLeading.Set();
                 };
@@ -176,13 +177,13 @@ public void LeaderElection()
 
                 leaderElector.OnStartedLeading += () =>
                 {
-                    leadershipHistory.Add("B starts leading");
+                    leadershipHistory.Enqueue("B starts leading");
                     testLeaderElectionLatch.Signal();
                 };
 
                 leaderElector.OnStoppedLeading += () =>
                 {
-                    leadershipHistory.Add("B stops leading");
+                    leadershipHistory.Enqueue("B stops leading");
                     testLeaderElectionLatch.Signal();
                 };