Fixes issue where occassionally a CID contains 'ERR' and fails the log assert.

Author: benbierens

Framework/KubernetesWorkflow/DownloadedLog.cs

@@ -6,6 +6,7 @@ public interface IDownloadedLog
     {
         string ContainerName { get; }
 
+        void IterateLines(Action<string> action);
         void IterateLines(Action<string> action, params string[] thatContain);
         string[] GetLinesContaining(string expectedString);
         string[] FindLinesThatContain(params string[] tags);
@@ -25,58 +26,39 @@ internal DownloadedLog(WriteToFileLogHandler logHandler, string containerName)
 
         public string ContainerName { get; }
 
-        public void IterateLines(Action<string> action, params string[] thatContain)
+        public void IterateLines(Action<string> action)
         {
             using var file = File.OpenRead(logFile.FullFilename);
             using var streamReader = new StreamReader(file);
 
             var line = streamReader.ReadLine();
             while (line != null)
             {
-                if (thatContain.All(line.Contains))
-                {
-                    action(line);
-                }
+                action(line);
                 line = streamReader.ReadLine();
             }
         }
 
-        public string[] GetLinesContaining(string expectedString)
+        public void IterateLines(Action<string> action, params string[] thatContain)
         {
-            using var file = File.OpenRead(logFile.FullFilename);
-            using var streamReader = new StreamReader(file);
-            var lines = new List<string>();
-
-            var line = streamReader.ReadLine();
-            while (line != null)
+            IterateLines(line =>
             {
-                if (line.Contains(expectedString))
+                if (thatContain.All(line.Contains))
                 {
-                    lines.Add(line);
+                    action(line);
                 }
-                line = streamReader.ReadLine();
-            }
+            });
+        }
 
-            return lines.ToArray(); ;
+        public string[] GetLinesContaining(string expectedString)
+        {
+            return FindLinesThatContain([expectedString]);
         }
 
         public string[] FindLinesThatContain(params string[] tags)
         {
             var result = new List<string>();
-            using var file = File.OpenRead(logFile.FullFilename);
-            using var streamReader = new StreamReader(file);
-
-            var line = streamReader.ReadLine();
-            while (line != null)
-            {
-                if (tags.All(line.Contains))
-                {
-                    result.Add(line);
-                }
-
-                line = streamReader.ReadLine();
-            }
-
+            IterateLines(result.Add, tags);
             return result.ToArray();
         }
 

Tests/DistTestCore/DownloadedLogExtensions.cs

@@ -23,5 +23,21 @@ public static void AssertLogDoesNotContain(this IDownloadedLog log, params strin
             }
             CollectionAssert.IsEmpty(errors);
         }
+
+        public static void AssertLogDoesNotContainLinesStartingWith(this IDownloadedLog log, params string[] unexpectedStrings)
+        {
+            var errors = new List<string>();
+            log.IterateLines(line =>
+            {
+                foreach (var str in unexpectedStrings)
+                {
+                    if (line.StartsWith(str))
+                    {
+                        errors.Add($"Found '{str}' at start of line '{line}'.");
+                    }
+                }
+            });
+            CollectionAssert.IsEmpty(errors);
+        }
     }
 }

Tests/ExperimentalTests/CodexDistTest.cs

@@ -99,7 +99,7 @@ public void CheckLogForErrors(ICodexNode node)
             var log = Ci.DownloadLog(node);
 
             log.AssertLogDoesNotContain("Block validation failed");
-            log.AssertLogDoesNotContain("ERR ");
+            log.AssertLogDoesNotContainLinesStartingWith("ERR ");
         }
 
         public void LogNodeStatus(ICodexNode node, IMetricsAccess? metrics = null)