Merge pull request #87 from ktmitton/cancellationTokenExtensionsRemoval

Removed CancellationTokenExtensions
ktmitton · Apr 17, 2022 · 97d3089 · 97d3089
2 parents 91c1b13 + 669ef5d
commit 97d3089
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 28 deletions.
diff --git a/Mittons.Fixtures.Example/Fixtures/ReportingEnvironmentFixture.cs b/Mittons.Fixtures.Example/Fixtures/ReportingEnvironmentFixture.cs
@@ -15,5 +15,13 @@ public class ReportingEnvironmentFixture : DockerEnvironmentFixture, Xunit.IAsyn
     public SftpContainer SftpContainer { get; set; }
 
     public override Task InitializeAsync()
-        => base.InitializeAsync(new CancellationToken().CreateLinkedTimeoutToken(TimeSpan.FromMinutes(5)));
+        => base.InitializeAsync(CreateTimeoutCancellationToken(TimeSpan.FromMinutes(5)));
+
+    private static CancellationToken CreateTimeoutCancellationToken(TimeSpan timeout)
+    {
+        var timeoutCancellationTokenSource = new CancellationTokenSource();
+        timeoutCancellationTokenSource.CancelAfter(timeout);
+
+        return timeoutCancellationTokenSource.Token;
+    }
 }
diff --git a/Mittons.Fixtures.Tests.Integration/Docker/Gateways/ContainerGatewayTests.cs b/Mittons.Fixtures.Tests.Integration/Docker/Gateways/ContainerGatewayTests.cs
@@ -754,7 +754,7 @@ public async Task ExecuteCommand_WhenCalled_ExpectResultsToBeReturned()
 
             for (var i = 0; i < 10; ++i)
             {
-                var health = await containerGateway.ExecuteCommandAsync(containerId, "ps aux | grep -v grep | grep sshd || exit 1", (new CancellationToken()).CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+                var health = await containerGateway.ExecuteCommandAsync(containerId, "ps aux | grep -v grep | grep sshd || exit 1", _cancellationToken);
 
                 if (health.Any())
                 {
@@ -765,7 +765,7 @@ public async Task ExecuteCommand_WhenCalled_ExpectResultsToBeReturned()
             }
 
             // Act
-            var results = await containerGateway.ExecuteCommandAsync(containerId, "ssh-keygen -l -E md5 -f /etc/ssh/ssh_host_rsa_key.pub", (new CancellationToken()).CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+            var results = await containerGateway.ExecuteCommandAsync(containerId, "ssh-keygen -l -E md5 -f /etc/ssh/ssh_host_rsa_key.pub", _cancellationToken);
 
             // Assert
             using var proc = new Process();

diff --git a/Mittons.Fixtures.Tests.Integration/Docker/Gateways/NetworkGatewayTests.cs b/Mittons.Fixtures.Tests.Integration/Docker/Gateways/NetworkGatewayTests.cs
@@ -67,7 +67,7 @@ public async Task CreateAsync_WhenCalled_ExpectNetworkToBeCreatedWithTheProvided
         _networkNames.Add(uniqueName);
 
         // Act
-        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken);
 
         // Assert
         using var proc = new Process();
@@ -110,7 +110,7 @@ public async Task CreateAsync_WhenCalledWithLabels_ExpectLabelsToBeAttachedToThe
         _networkNames.Add(uniqueName);
 
         // Act
-        await networkGateway.CreateAsync(uniqueName, expectedOptions, _cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+        await networkGateway.CreateAsync(uniqueName, expectedOptions, _cancellationToken);
 
         // Assert
         using var proc = new Process();
@@ -141,7 +141,7 @@ public async Task RemoveAsync_WhenCalled_ExpectNetworkToBeRemoved()
 
         _networkNames.Add(uniqueName);
 
-        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken);
 
         // Act
         await networkGateway.RemoveAsync(uniqueName, _cancellationToken);
@@ -176,7 +176,7 @@ public async Task ConnectAsync_WhenCalled_ExpectContainerToBeConnectedToNetwork(
 
         _networkNames.Add(uniqueName);
 
-        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5)));
+        await networkGateway.CreateAsync(uniqueName, Enumerable.Empty<Option>(), _cancellationToken);
 
         // Act
         await networkGateway.ConnectAsync(uniqueName, containerId, "test.example.com", _cancellationToken);

diff --git a/Mittons.Fixtures/Docker/Containers/Container.cs b/Mittons.Fixtures/Docker/Containers/Container.cs
@@ -115,11 +115,9 @@ public Task EmptyDirectoryAsync(string directory, CancellationToken cancellation
 
         private async Task<string> EnsureHealthyAsync(CancellationToken cancellationToken)
         {
-            var timeoutToken = cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromMinutes(1));
-
             while (true)
             {
-                var healthStatus = await _containerGateway.GetHealthStatusAsync(Id, timeoutToken).ConfigureAwait(false);
+                var healthStatus = await _containerGateway.GetHealthStatusAsync(Id, cancellationToken).ConfigureAwait(false);
 
                 if ((healthStatus == HealthStatus.Running) || (healthStatus == HealthStatus.Healthy))
                 {
@@ -128,7 +126,7 @@ private async Task<string> EnsureHealthyAsync(CancellationToken cancellationToke
 
                 await Task.Delay(TimeSpan.FromMilliseconds(50)).ConfigureAwait(false);
 
-                timeoutToken.ThrowIfCancellationRequested();
+                cancellationToken.ThrowIfCancellationRequested();
             }
 
             return Id;

diff --git a/Mittons.Fixtures/Docker/Containers/SftpContainer.cs b/Mittons.Fixtures/Docker/Containers/SftpContainer.cs
@@ -78,7 +78,7 @@ public Task EmptyUserDirectoryAsync(string user, CancellationToken cancellationT
 
         private async Task<string> GetFingerprintAsync(IContainerGateway containerGateway, string algorithm, string hash, CancellationToken cancellationToken)
         {
-            var execResults = (await containerGateway.ExecuteCommandAsync(Id, $"ssh-keygen -l -E {hash} -f /etc/ssh/ssh_host_{algorithm}_key.pub", cancellationToken.CreateLinkedTimeoutToken(TimeSpan.FromSeconds(5))).ConfigureAwait(false)).ToArray();
+            var execResults = (await containerGateway.ExecuteCommandAsync(Id, $"ssh-keygen -l -E {hash} -f /etc/ssh/ssh_host_{algorithm}_key.pub", cancellationToken).ConfigureAwait(false)).ToArray();
 
             if (execResults.Length != 1)
             {

diff --git a/Mittons.Fixtures/Extensions/CancellationTokenExtensions.cs b/Mittons.Fixtures/Extensions/CancellationTokenExtensions.cs