Enables console output for release tests.

Author: benbierens

Framework/Logging/BaseLog.cs

@@ -7,8 +7,10 @@ public interface ILog
         void Log(string message);
         void Debug(string message = "", int skipFrames = 0);
         void Error(string message);
+        void Raw(string message);
         void AddStringReplace(string from, string to);
         LogFile CreateSubfile(string addName, string ext = "log");
+        string GetFullName();
     }
 
     public abstract class BaseLog : ILog
@@ -28,7 +30,8 @@ public BaseLog()
         }
 
         protected bool IsDebug { get; private set; }
-        protected abstract string GetFullName();
+
+        public abstract string GetFullName();
 
         public LogFile LogFile 
         {
@@ -60,6 +63,11 @@ public virtual void Error(string message)
             Log(msg);
         }
 
+        public void Raw(string message)
+        {
+            LogFile.WriteRaw(message);
+        }
+
         public virtual void AddStringReplace(string from, string to)
         {
             if (string.IsNullOrWhiteSpace(from)) return;

Framework/Logging/ConsoleLog.cs

@@ -2,7 +2,7 @@
 {
     public class ConsoleLog : BaseLog
     {
-        protected override string GetFullName()
+        public override string GetFullName()
         {
             return "CONSOLE";
         }

Framework/Logging/FileLog.cs

@@ -9,7 +9,7 @@ public FileLog(string fullFilename)
 
         public string FullFilename { get; }
 
-        protected override string GetFullName()
+        public override string GetFullName()
         {
             return FullFilename;
         }

Framework/Logging/LogPrefixer.cs

@@ -17,7 +17,6 @@ public LogPrefixer(ILog backingLog, string prefix)
 
         public string Prefix { get; set; } = string.Empty;
 
-
         public LogFile CreateSubfile(string addName, string ext = "log")
         {
             return backingLog.CreateSubfile(addName, ext);
@@ -42,5 +41,15 @@ public void AddStringReplace(string from, string to)
         {
             backingLog.AddStringReplace(from, to);
         }
+
+        public void Raw(string message)
+        {
+            backingLog.Raw(message);
+        }
+
+        public string GetFullName()
+        {
+            return backingLog.GetFullName();
+        }
     }
 }

Framework/Logging/LogSplitter.cs

@@ -29,11 +29,21 @@ public void Error(string message)
             OnAll(l => l.Error(message));
         }
 
+        public string GetFullName()
+        {
+            return targetLogs.First().GetFullName();
+        }
+
         public void Log(string message)
         {
             OnAll(l => l.Log(message));
         }
 
+        public void Raw(string message)
+        {
+            OnAll(l => l.Raw(message));
+        }
+
         private void OnAll(Action<ILog> action)
         {
             foreach (var t in targetLogs) action(t);

Framework/Logging/NullLog.cs

@@ -2,11 +2,9 @@
 {
     public class NullLog : BaseLog
     {
-        public string FullFilename { get; set; } = "NULL";
-
-        protected override string GetFullName()
+        public override string GetFullName()
         {
-            return FullFilename;
+            return "NULL";
         }
 
         public override void Log(string message)

Tests/CodexContinuousTests/ContinuousTestRunner.cs

@@ -27,7 +27,7 @@ public void Run()
             var startTime = DateTime.UtcNow;
 
             var overviewLog = new LogSplitter(
-                new FixtureLog(logConfig, startTime, config.CodexDeployment.Id, "Overview"),
+                FixtureLog.Create(logConfig, startTime, config.CodexDeployment.Id, "Overview"),
                 new ConsoleLog()
             );
             var statusLog = new StatusLog(logConfig, startTime, "continuous-tests", config.CodexDeployment.Id,

Tests/CodexContinuousTests/SingleTestRun.cs

@@ -37,7 +37,7 @@ public SingleTestRun(EntryPointFactory entryPointFactory,
             this.handle = handle;
             this.cancelToken = cancelToken;
             testName = handle.Test.GetType().Name;
-            fixtureLog = new FixtureLog(new LogConfig(config.LogPath), DateTime.UtcNow, deployId, testName);
+            fixtureLog = FixtureLog.Create(new LogConfig(config.LogPath), DateTime.UtcNow, deployId, testName);
             entryPoint = entryPointFactory.CreateEntryPoint(config.KubeConfigFile, config.DataPath,
                 config.CodexDeployment.Metadata.KubeNamespace, fixtureLog);
             ApplyLogReplacements(fixtureLog, startupChecker);
@@ -81,17 +81,11 @@ private void RunTest(Action<bool> resultHandler)
                 OverviewLog($" > Test passed. ({Time.FormatDuration(duration)})");
                 UpdateStatusLogPassed(testStart, duration);
 
-                if (!config.KeepPassedTestLogs)
-                {
-                    fixtureLog.Delete();
-                }
-
                 resultHandler(true);
             }
             catch (Exception ex)
             {
                 fixtureLog.Error("Test run failed with exception: " + ex);
-                fixtureLog.MarkAsFailed();
                 UpdateStatusLogFailed(testStart, duration, ex.ToString());
 
                 DownloadContainerLogs(testStart);

Tests/CodexContinuousTests/StartupChecker.cs

@@ -22,7 +22,7 @@ public StartupChecker(EntryPoint entryPoint, Configuration config, CancellationT
 
         public void Check()
         {
-            var log = new FixtureLog(new LogConfig(config.LogPath), DateTime.UtcNow, config.CodexDeployment.Id,
+            var log = FixtureLog.Create(new LogConfig(config.LogPath), DateTime.UtcNow, config.CodexDeployment.Id,
                 "StartupChecks");
             log.Log("Starting continuous test run...");
             IncludeDeploymentConfiguration(log);
@@ -90,7 +90,7 @@ private void PreflightCheck(Configuration config)
             }
         }
 
-        private void CheckCodexNodes(BaseLog log, Configuration config)
+        private void CheckCodexNodes(ILog log, Configuration config)
         {
             throw new NotImplementedException();
 

Tests/DistTestCore/DistTest.cs

@@ -33,7 +33,7 @@ public DistTest()
 
             var logConfig = configuration.GetLogConfig();
             var startTime = DateTime.UtcNow;
-            fixtureLog = new FixtureLog(logConfig, startTime, deployId);
+            fixtureLog = FixtureLog.Create(logConfig, startTime, deployId);
             statusLog = new StatusLog(logConfig, startTime, "dist-tests", deployId);
 
             globalEntryPoint = new EntryPoint(fixtureLog, configuration.GetK8sConfiguration(new DefaultK8sTimeSet(), TestNamespacePrefix), configuration.GetFileManagerFolder());
@@ -44,7 +44,7 @@ public DistTest()
         [OneTimeSetUp]
         public void GlobalSetup()
         {
-            fixtureLog.Log($"Distributed Tests are starting...");
+            fixtureLog.Log($"Starting...");
             globalEntryPoint.Announce();
 
             // Previous test run may have been interrupted.
@@ -87,7 +87,15 @@ public void SetUpDistTest()
             }
             else
             {
-                CreateNewTestLifecycle();
+                try
+                {
+                    CreateNewTestLifecycle();
+                }
+                catch (Exception ex)
+                {
+                    fixtureLog.Error("Setup failed: " + ex);
+                    GlobalTestFailure.HasFailed = true;
+                }
             }
         }
 
@@ -236,11 +244,6 @@ private void WriteEndTestLog(TestLog log)
                 Log(result.Message);
                 Log($"{result.StackTrace}");
             }
-
-            if (result.Outcome.Status == TestStatus.Failed)
-            {
-                log.MarkAsFailed();
-            }
         }
 
         private IWebCallTimeSet GetWebCallTimeSet()
@@ -296,11 +299,6 @@ protected T[] GetCurrentTestMethodAttribute<T>() where T : PropertyAttribute
         private void IncludeLogsOnTestFailure(TestLifecycle lifecycle)
         {
             var testStatus = TestContext.CurrentContext.Result.Outcome.Status;
-            if (testStatus == TestStatus.Failed)
-            {
-                fixtureLog.MarkAsFailed();
-            }
-
             if (ShouldDownloadAllLogs(testStatus))
             {
                 lifecycle.Log.Log("Downloading all container logs...");

Tests/DistTestCore/Logs/BaseTestLog.cs

@@ -2,27 +2,83 @@
 
 namespace DistTestCore.Logs
 {
-    public abstract class BaseTestLog : BaseLog
+    public abstract class BaseTestLog : ILog
     {
-        private bool hasFailed;
-        private readonly string deployId;
+        private readonly ILog backingLog;
 
-        protected BaseTestLog(string deployId)
+        protected BaseTestLog(ILog backingLog, string deployId)
         {
-            this.deployId = deployId;
+            this.backingLog = backingLog;
+
+            DeployId = deployId;
+        }
+
+        public string DeployId { get; }
+
+        public void AddStringReplace(string from, string to)
+        {
+            backingLog.AddStringReplace(from, to);
+        }
+
+        public LogFile CreateSubfile(string addName, string ext = "log")
+        {
+            return backingLog.CreateSubfile(addName, ext);
+        }
+
+        public void Debug(string message = "", int skipFrames = 0)
+        {
+            backingLog.Debug(message, skipFrames);
+        }
+
+        public void Error(string message)
+        {
+            backingLog.Error(message);
+        }
+
+        public string GetFullName()
+        {
+            return backingLog.GetFullName();
+        }
+
+        public void Log(string message)
+        {
+            backingLog.Log(message);
+        }
+
+        public void Raw(string message)
+        {
+            backingLog.Raw(message);
         }
 
         public void WriteLogTag()
         {
             var category = NameUtils.GetCategoryName();
             var name = NameUtils.GetTestMethodName();
-            LogFile.WriteRaw($"{deployId} {category} {name}");
+            backingLog.Raw($"{DeployId} {category} {name}");
         }
 
-        public void MarkAsFailed()
+        protected static ILog CreateMainLog(string fullName, string name)
         {
-            if (hasFailed) return;
-            hasFailed = true;
+            ILog log = new FileLog(fullName);
+            log = ApplyConsoleOutput(log);
+            return log;
+        }
+
+        private static ILog ApplyConsoleOutput(ILog log)
+        {
+            // If we're running as a release test, we'll split the log output
+            // to the console as well.
+
+            var testType = Environment.GetEnvironmentVariable("TEST_TYPE");
+            if (string.IsNullOrEmpty(testType) || testType.ToLowerInvariant() != "release-tests")
+            {
+                return log;
+            }
+
+            return new LogSplitter(
+                log,
+                new ConsoleLog()
+            );
         }
     }
 }

Tests/DistTestCore/Logs/FixtureLog.cs

@@ -4,28 +4,26 @@ namespace DistTestCore.Logs
 {
     public class FixtureLog : BaseTestLog
     {
-        private readonly string fullName;
+        private readonly ILog backingLog;
         private readonly string deployId;
 
-        public FixtureLog(LogConfig config, DateTime start, string deployId, string name = "") : base(deployId)
+        public FixtureLog(ILog backingLog, string deployId)
+            : base(backingLog, deployId)
         {
+            this.backingLog = backingLog;
             this.deployId = deployId;
-            fullName = NameUtils.GetFixtureFullName(config, start, name);
         }
 
         public TestLog CreateTestLog(string name = "")
         {
-            return new TestLog(fullName, deployId, name);
+            return TestLog.Create(this, name);
         }
 
-        public void DeleteFolder()
+        public static FixtureLog Create(LogConfig config, DateTime start, string deployId, string name = "")
         {
-            Directory.Delete(fullName, true);
-        }
-
-        protected override string GetFullName()
-        {
-            return fullName;
+            var fullName = NameUtils.GetFixtureFullName(config, start, name);
+            var log = CreateMainLog(fullName, name);
+            return new FixtureLog(log, deployId);
         }
     }
-}
+}

Tests/DistTestCore/Logs/TestLog.cs

@@ -1,20 +1,22 @@
-namespace DistTestCore.Logs
+using Logging;
+using System.Xml.Linq;
+
+namespace DistTestCore.Logs
 {
     public class TestLog : BaseTestLog
     {
-        private readonly string fullName;
-
-        public TestLog(string folder, string deployId, string name = "") : base(deployId)
+        public TestLog(ILog backingLog, string methodName, string deployId, string name = "")
+            : base(backingLog, deployId)
         {
-            var methodName = NameUtils.GetTestMethodName(name);
-            fullName = Path.Combine(folder, methodName);
-
-            Log($"*** Begin: {methodName}");
+            backingLog.Log($"*** Begin: {methodName}");
         }
 
-        protected override string GetFullName()
+        public static TestLog Create(FixtureLog parentLog, string name = "")
         {
-            return fullName;
+            var methodName = NameUtils.GetTestMethodName(name);
+            var fullName = Path.Combine(parentLog.GetFullName(), methodName);
+            var backingLog = CreateMainLog(fullName, name);
+            return new TestLog(backingLog, methodName, parentLog.DeployId);
         }
     }
 }