Merge pull request #27 from darrylmelander/hostname

testsuite's hostname attribute should be the machine name, not the executor
spekt · Sep 23, 2020 · c4f294f · c4f294f
2 parents 0c11217 + 21692ab
commit c4f294f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/JUnit.Xml.TestLogger/JUnitXmlTestLogger.cs b/src/JUnit.Xml.TestLogger/JUnitXmlTestLogger.cs
@@ -494,7 +494,7 @@ private XElement CreateTestSuiteElement(List<TestResultInfo> results)
             element.SetAttributeValue("errors", 0); // looks like this isn't supported by .net?
             element.SetAttributeValue("time", results.Sum(x => x.Duration.TotalSeconds));
             element.SetAttributeValue("timestamp", this.utcStartTime.ToString("s"));
-            element.SetAttributeValue("hostname", results.First().TestCase.ExecutorUri);
+            element.SetAttributeValue("hostname", results.First().HostName);
             element.SetAttributeValue("id", 0); // we never output multiple, so this is always zero.
             element.SetAttributeValue("package", Path.GetFileName(results.First().AssemblyPath));
 

diff --git a/src/JUnit.Xml.TestLogger/TestResultInfo.cs b/src/JUnit.Xml.TestLogger/TestResultInfo.cs
@@ -29,6 +29,8 @@ public TestResultInfo(
 
         public string AssemblyPath => this.result.TestCase.Source;
 
+        public string HostName => this.result.ComputerName;
+
         public string Namespace { get; private set; }
 
         public string Type { get; private set; }

diff --git a/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnitTestLoggerAcceptanceTests.cs b/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnitTestLoggerAcceptanceTests.cs
@@ -55,7 +55,8 @@ public void TestResultFileShouldContainTestSuiteInformation()
 
             Assert.IsNotNull(node);
             Assert.AreEqual("JUnit.Xml.TestLogger.NetCore.Tests.dll", node.Attribute(XName.Get("name")).Value);
-            Assert.AreEqual("executor://nunit3testexecutor/", node.Attribute(XName.Get("hostname")).Value);
+            Assert.AreEqual(Environment.MachineName, node.Attribute(XName.Get("hostname")).Value);
+
             Assert.AreEqual("52", node.Attribute(XName.Get("tests")).Value);
             Assert.AreEqual("14", node.Attribute(XName.Get("failures")).Value);
             Assert.AreEqual("6", node.Attribute(XName.Get("skipped")).Value);