Fixup

Author: mdarocha

test/Docker.DotNet.Tests/ISwarmOperationsTests.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Docker.DotNet.Models;
@@ -10,11 +12,18 @@ namespace Docker.DotNet.Tests
     [Collection(nameof(TestCollection))]
     public class ISwarmOperationsTests
     {
+        private readonly CancellationTokenSource _cts;
+
         private readonly DockerClient _dockerClient;
         private readonly string _imageId;
 
         public ISwarmOperationsTests(TestFixture testFixture)
         {
+            // Do not wait forever in case it gets stuck
+            _cts = CancellationTokenSource.CreateLinkedTokenSource(testFixture.Cts.Token);
+            _cts.CancelAfter(TimeSpan.FromMinutes(5));
+            _cts.Token.Register(() => throw new TimeoutException("SwarmOperationTests timeout"));
+
             _dockerClient = testFixture.DockerClient;
             _imageId = testFixture.Image.ID;
         }
@@ -148,5 +157,103 @@ public async Task GetServices_Succeeds()
             await _dockerClient.Swarm.RemoveServiceAsync(secondServiceId, default);
             await _dockerClient.Swarm.RemoveServiceAsync(thirdServiceid, default);
         }
+
+        [Fact]
+        public async Task GetServiceLogs_Succeeds()
+        {
+            var cts = new CancellationTokenSource();
+            var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token, cts.Token);
+
+            var serviceName = $"service-withLogs-{Guid.NewGuid().ToString().Substring(1, 10)}";
+            var serviceId = _dockerClient.Swarm.CreateServiceAsync(new ServiceCreateParameters
+            {
+                Service = new ServiceSpec
+                {
+                    Name = serviceName,
+                    TaskTemplate = new TaskSpec { ContainerSpec = new ContainerSpec { Image = _imageId } }
+                }
+            }).Result.ID;
+
+            var _stream = await _dockerClient.Swarm.GetServiceLogsAsync(serviceName, false, new ServiceLogsParameters
+            {
+                Follow = true,
+                ShowStdout = true,
+                ShowStderr = true
+            });
+
+            int maxRetries = 3;
+            int currentRetry = 0;
+            TimeSpan delayBetweenRetries = TimeSpan.FromSeconds(5);
+            List<string> logLines = null;
+
+            while (currentRetry < maxRetries && !linkedCts.IsCancellationRequested)
+            {
+                logLines = new List<string>();
+                TimeSpan delay = TimeSpan.FromSeconds(10);
+                cts.CancelAfter(delay);
+
+                bool cancelRequested = false; // Add a flag to indicate cancellation
+
+                while (!linkedCts.IsCancellationRequested && !cancelRequested)
+                {
+                    var line = new List<byte>();
+                    var buffer = new byte[4096];
+
+                    try
+                    {
+                        while (true)
+                        {
+                            var res = await _stream.ReadOutputAsync(buffer, 0, buffer.Length, linkedCts.Token);
+
+                            if (res.Count == 0)
+                            {
+                                continue;
+                            }
+
+                            int newlineIndex = Array.IndexOf(buffer, (byte)'\n', 0, res.Count);
+
+                            if (newlineIndex != -1)
+                            {
+                                line.AddRange(buffer.Take(newlineIndex));
+                                break;
+                            }
+                            else
+                            {
+                                line.AddRange(buffer.Take(res.Count));
+                            }
+                        }
+
+                        logLines.Add(Encoding.UTF8.GetString(line.ToArray()));
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        cancelRequested = true; // Set the flag when cancellation is requested
+
+                        // Reset the CancellationTokenSource for the next attempt
+                        cts = new CancellationTokenSource();
+                        linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token, cts.Token);
+                        cts.CancelAfter(delay);
+                    }
+                }
+
+                if (logLines.Any() && logLines.First().Contains("[INF]"))
+                {
+                    break;
+                }
+                else
+                {
+                    currentRetry++;
+                    if (currentRetry < maxRetries)
+                    {
+                        await Task.Delay(delayBetweenRetries);
+                    }
+                }
+            }
+
+            Assert.True(logLines.Any());
+            Assert.Contains("[INF]", logLines.First());
+
+            await _dockerClient.Swarm.RemoveServiceAsync(serviceId, default);
+        }
     }
 }

test/Docker.DotNet.Tests/QueryStringTests.cs

@@ -1,46 +1,46 @@
-using System;
-using System.Collections.Generic;
-using Docker.DotNet.Models;
-using Xunit;
-
-namespace Docker.DotNet.Tests
-{
-    public class QueryStringTests
-    {
-        [Fact]
-        public void ServiceListParameters_GenerateIdFilters()
-        {
-            var p = new ServicesListParameters { Filters = new ServiceFilter { Id = new string[] { "service-id" } } };
-            var qs = new QueryString<ServicesListParameters>(p);
-
-            Assert.Equal("filters={\"id\":[\"service-id\"]}", Uri.UnescapeDataString(qs.GetQueryString()));
-        }
-
-        [Fact]
-        public void ServiceListParameters_GenerateCompositeFilters()
-        {
-            var p = new ServicesListParameters { Filters = new ServiceFilter { Id = new string[] { "service-id" }, Label = new string[] { "label" } } };
-            var qs = new QueryString<ServicesListParameters>(p);
-
-            Assert.Equal("filters={\"id\":[\"service-id\"],\"label\":[\"label\"]}", Uri.UnescapeDataString(qs.GetQueryString()));
-        }
-
-        [Fact]
-        public void ServicesListParameters_GenerateNullFilters()
-        {
-            var p = new ServicesListParameters { Filters = new ServiceFilter() };
-            var qs = new QueryString<ServicesListParameters>(p);
-
-            Assert.Equal("filters={}", Uri.UnescapeDataString(qs.GetQueryString()));
-        }
-
-        [Fact]
-        public void ServicesListParameters_GenerateNullModeFilters()
-        {
-            var p = new ServicesListParameters { Filters = new ServiceFilter() { Mode = new ServiceCreationMode[] { } } };
-            var qs = new QueryString<ServicesListParameters>(p);
-
-            Assert.Equal("filters={\"mode\":[]}", Uri.UnescapeDataString(qs.GetQueryString()));
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using Docker.DotNet.Models;
+using Xunit;
+
+namespace Docker.DotNet.Tests
+{
+    public class QueryStringTests
+    {
+        [Fact]
+        public void ServiceListParameters_GenerateIdFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter { Id = new string[] { "service-id" } } };
+            var qs = new QueryString<ServicesListParameters>(p);
+
+            Assert.Equal("filters={\"id\":[\"service-id\"]}", Uri.UnescapeDataString(qs.GetQueryString()));
+        }
+
+        [Fact]
+        public void ServiceListParameters_GenerateCompositeFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter { Id = new string[] { "service-id" }, Label = new string[] { "label" } } };
+            var qs = new QueryString<ServicesListParameters>(p);
+
+            Assert.Equal("filters={\"id\":[\"service-id\"],\"label\":[\"label\"]}", Uri.UnescapeDataString(qs.GetQueryString()));
+        }
+
+        [Fact]
+        public void ServicesListParameters_GenerateNullFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter() };
+            var qs = new QueryString<ServicesListParameters>(p);
+
+            Assert.Equal("filters={}", Uri.UnescapeDataString(qs.GetQueryString()));
+        }
+
+        [Fact]
+        public void ServicesListParameters_GenerateNullModeFilters()
+        {
+            var p = new ServicesListParameters { Filters = new ServiceFilter() { Mode = new ServiceCreationMode[] { } } };
+            var qs = new QueryString<ServicesListParameters>(p);
+
+            Assert.Equal("filters={\"mode\":[]}", Uri.UnescapeDataString(qs.GetQueryString()));
+        }
+    }
+}