Users/shreyas r msft/added env var support for blame results director…

…y path (#2216) * Added env var support to blame test results directory path and fixed blame aborting without killing the test host process on hang timeout when there is an error with dump * Added tests
microsoft · Oct 7, 2019 · 131ca14 · 131ca14
1 parent f0cd370
commit 131ca14
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 3 deletions.
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs
@@ -126,6 +126,7 @@ public override void Initialize(
             {
                 var collectDumpNode = this.configurationElement[Constants.DumpModeKey];
                 this.collectProcessDumpOnTrigger = collectDumpNode != null;
+
                 if (this.collectProcessDumpOnTrigger)
                 {
                     this.ValidateAndAddTriggerBasedProcessDumpParameters(collectDumpNode);
@@ -198,8 +199,9 @@ private void CollectDumpAndAbortTesthost()
                     EqtTrace.Error("BlameCollector.CollectDumpAndAbortTesthost: blame:CollectDumpOnHang was enabled but dump file was not generated.");
                 }
             }
-            catch (FileNotFoundException ex)
+            catch (Exception ex)
             {
+                // Eat up any exception here and log it but proceed with killing the test host process.
                 EqtTrace.Error(ex);
             }
 
@@ -485,7 +487,8 @@ private string GetResultsDirectory()
             {
                 XmlElement resultsDirectoryElement = this.configurationElement["ResultsDirectory"];
                 string resultsDirectory = resultsDirectoryElement != null ? resultsDirectoryElement.InnerText : string.Empty;
-                return resultsDirectory;
+
+                return Environment.ExpandEnvironmentVariables(resultsDirectory);
             }
             catch (NullReferenceException exception)
             {

diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs
@@ -189,6 +189,73 @@ public void InitializeWithDumpForHangShouldCaptureADumpOnTimeout()
             this.mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
         }
 
+        /// <summary>
+        /// Initializing with collect dump for hang should kill test host process even if an error
+        /// occurs during capturing the dump. Basically it should not throw.
+        /// </summary>
+        [TestMethod]
+        public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfGetDumpFileFails()
+        {
+            this.blameDataCollector = new TestableBlameCollector(
+                this.mockBlameReaderWriter.Object,
+                this.mockProcessDumpUtility.Object,
+                null,
+                this.mockFileHelper.Object);
+
+            var hangBasedDumpcollected = new ManualResetEventSlim();
+
+            this.mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
+            this.mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
+            this.mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()));
+            this.mockProcessDumpUtility.Setup(x => x.GetDumpFile()).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some exception"));
+
+            this.blameDataCollector.Initialize(
+                this.GetDumpConfigurationElement(false, false, true, 0),
+                this.mockDataColectionEvents.Object,
+                this.mockDataCollectionSink.Object,
+                this.mockLogger.Object,
+                this.context);
+
+            hangBasedDumpcollected.Wait(1000);
+            this.mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+            this.mockProcessDumpUtility.Verify(x => x.GetDumpFile(), Times.Once);
+        }
+
+        /// <summary>
+        /// Initializing with collect dump for hang should kill test host process even if an error
+        /// occurs during attaching it as a datacollector attachment. Basically it should not throw.
+        /// </summary>
+        [TestMethod]
+        public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfAttachingDumpFails()
+        {
+            this.blameDataCollector = new TestableBlameCollector(
+                this.mockBlameReaderWriter.Object,
+                this.mockProcessDumpUtility.Object,
+                null,
+                this.mockFileHelper.Object);
+
+            var dumpFile = "abc_hang.dmp";
+            var hangBasedDumpcollected = new ManualResetEventSlim();
+
+            this.mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
+            this.mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
+            this.mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()));
+            this.mockProcessDumpUtility.Setup(x => x.GetDumpFile()).Returns(dumpFile);
+            this.mockDataCollectionSink.Setup(x => x.SendFileAsync(It.IsAny<FileTransferInformation>())).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some other exception"));
+
+            this.blameDataCollector.Initialize(
+                this.GetDumpConfigurationElement(false, false, true, 0),
+                this.mockDataColectionEvents.Object,
+                this.mockDataCollectionSink.Object,
+                this.mockLogger.Object,
+                this.context);
+
+            hangBasedDumpcollected.Wait(1000);
+            this.mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+            this.mockProcessDumpUtility.Verify(x => x.GetDumpFile(), Times.Once);
+            this.mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
+        }
+
         /// <summary>
         /// The trigger session ended handler should write to file if test start count is greater.
         /// </summary>
@@ -593,7 +660,7 @@ public void TriggerTestHostLaunchedHandlerShouldCatchTestPlatFormExceptionsAndRe
         }
 
         /// <summary>
-        /// The trigger test host launcehd handler should not break if start process dump throws unknown exceptions and report message with stack trace
+        /// The trigger test host launched handler should not break if start process dump throws unknown exceptions and report message with stack trace
         /// </summary>
         [TestMethod]
         public void TriggerTestHostLaunchedHandlerShouldCatchAllUnexpectedExceptionsAndReportMessageWithStackTrace()