From fde3b4bbe3695195870441fd807e61e9a83adb99 Mon Sep 17 00:00:00 2001
From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:31:33 +0100
Subject: [PATCH] fix: Make sure container runs before reading output

---
 .github/workflows/ci.yml                       |  2 +-
 .../IContainerOperationsTests.cs               | 18 +++++-------------
 version.json                                   |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc8befda..b5d3f49e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
diff --git a/test/Docker.DotNet.Tests/IContainerOperationsTests.cs b/test/Docker.DotNet.Tests/IContainerOperationsTests.cs
index 3da5a876..14c35124 100644
--- a/test/Docker.DotNet.Tests/IContainerOperationsTests.cs
+++ b/test/Docker.DotNet.Tests/IContainerOperationsTests.cs
@@ -135,7 +135,6 @@ await _dockerClient.Containers.StopContainerAsync(
         [Fact]
         public async Task GetContainerLogs_Tty_False_Follow_False_ReadsLogs()
         {
-            using var containerLogsCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
             var logList = new List<string>();
 
             var createContainerResponse = await _dockerClient.Containers.CreateContainerAsync(
@@ -154,9 +153,7 @@ await _dockerClient.Containers.StartContainerAsync(
                 _cts.Token
             );
 
-            containerLogsCts.CancelAfter(TimeSpan.FromSeconds(5));
-
-            var containerLogsTask = _dockerClient.Containers.GetContainerLogsAsync(
+            await _dockerClient.Containers.GetContainerLogsAsync(
                 createContainerResponse.ID,
                 new ContainerLogsParameters
                 {
@@ -165,7 +162,7 @@ await _dockerClient.Containers.StartContainerAsync(
                     Timestamps = true,
                     Follow = false
                 },
-                containerLogsCts.Token,
+                default,
                 new Progress<string>(m => { logList.Add(m); _output.WriteLine(m); })
             );
 
@@ -175,7 +172,6 @@ await _dockerClient.Containers.StopContainerAsync(
                 _cts.Token
             );
 
-            await containerLogsTask;
             _output.WriteLine($"Line count: {logList.Count}");
 
             Assert.NotEmpty(logList);
@@ -184,7 +180,6 @@ await _dockerClient.Containers.StopContainerAsync(
         [Fact]
         public async Task GetContainerLogs_Tty_True_Follow_False_ReadsLogs()
         {
-            using var containerLogsCts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
             var logList = new List<string>();
 
             var createContainerResponse = await _dockerClient.Containers.CreateContainerAsync(
@@ -203,9 +198,9 @@ await _dockerClient.Containers.StartContainerAsync(
                 _cts.Token
             );
 
-            containerLogsCts.CancelAfter(TimeSpan.FromSeconds(5));
+            await Task.Delay(TimeSpan.FromSeconds(5));
 
-            var containerLogsTask = _dockerClient.Containers.GetContainerLogsAsync(
+            await _dockerClient.Containers.GetContainerLogsAsync(
                 createContainerResponse.ID,
                 new ContainerLogsParameters
                 {
@@ -214,19 +209,16 @@ await _dockerClient.Containers.StartContainerAsync(
                     Timestamps = true,
                     Follow = false
                 },
-                containerLogsCts.Token,
+                default,
                 new Progress<string>(m => { _output.WriteLine(m); logList.Add(m); })
             );
 
-            await Task.Delay(TimeSpan.FromSeconds(5));
-
             await _dockerClient.Containers.StopContainerAsync(
                 createContainerResponse.ID,
                 new ContainerStopParameters(),
                 _cts.Token
             );
 
-            await containerLogsTask;
             _output.WriteLine($"Line count: {logList.Count}");
 
             Assert.NotEmpty(logList);
diff --git a/version.json b/version.json
index 9b8d0ed0..f72d2722 100644
--- a/version.json
+++ b/version.json
@@ -8,7 +8,7 @@
     // optional list of paths to consider when calculating version height.
   ],
   "publicReleaseRefSpec": [
-    "^refs/heads/master$", // we release out of master
+    "^refs/heads/main$", // we release out of main
     "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N
   ],
   "cloudBuild": {