From bdfe386e99988392704e64e26acff809a6dc8132 Mon Sep 17 00:00:00 2001 From: linustanley Date: Sun, 2 Jul 2017 23:01:30 +0700 Subject: [PATCH] Adding days in build time for long running tasks Build time ("Running time on dashboard") is not showing days taken for the build. This is a shortfall, when a build takes more than one day to finish. --- .../Core/Publishers/Statistics/StatisticsBuilderTest.cs | 2 +- project/UnitTests/Core/Publishers/XmlLogFixture.cs | 4 ++-- project/core/publishers/XmlIntegrationResultWriter.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/UnitTests/Core/Publishers/Statistics/StatisticsBuilderTest.cs b/project/UnitTests/Core/Publishers/Statistics/StatisticsBuilderTest.cs index 94b7ac2d2..a393e89c5 100644 --- a/project/UnitTests/Core/Publishers/Statistics/StatisticsBuilderTest.cs +++ b/project/UnitTests/Core/Publishers/Statistics/StatisticsBuilderTest.cs @@ -118,7 +118,7 @@ public void ShouldPopulateTimingsFromIntegrationResult() results = builder.ProcessBuildResults(result); AssertHasStatistic("StartTime", DateUtil.FormatDate(result.StartTime), results); - AssertHasStatistic("Duration", new TimeSpan(0, 32, 0).ToString(), results); + AssertHasStatistic("Duration","00:00:32:00", results); //AssertHasStatistic("ProjectName", "Foo", results); } diff --git a/project/UnitTests/Core/Publishers/XmlLogFixture.cs b/project/UnitTests/Core/Publishers/XmlLogFixture.cs index 72e20ee63..90f85ad5c 100644 --- a/project/UnitTests/Core/Publishers/XmlLogFixture.cs +++ b/project/UnitTests/Core/Publishers/XmlLogFixture.cs @@ -17,12 +17,12 @@ public static string CreateExpectedBuildXml(IntegrationResult result, string exp string error = (result.Status == IntegrationStatus.Failure) ? " error=\"true\"" : String.Empty; if (expectedBuildOutput == null) { - return string.Format(@"", DateUtil.FormatDate(result.StartTime), error, result.BuildCondition); + return string.Format(@"", DateUtil.FormatDate(result.StartTime), error, result.BuildCondition); } else { expectedBuildOutput = expectedBuildOutput.Replace("\r", string.Empty); - return string.Format(@"{2}", DateUtil.FormatDate(result.StartTime), error, expectedBuildOutput, result.BuildCondition); + return string.Format(@"{2}", DateUtil.FormatDate(result.StartTime), error, expectedBuildOutput, result.BuildCondition); } } } diff --git a/project/core/publishers/XmlIntegrationResultWriter.cs b/project/core/publishers/XmlIntegrationResultWriter.cs index 8806bd95c..40dab06d1 100644 --- a/project/core/publishers/XmlIntegrationResultWriter.cs +++ b/project/core/publishers/XmlIntegrationResultWriter.cs @@ -96,7 +96,7 @@ public void WriteBuildElement(IIntegrationResult result) // hide the milliseconds TimeSpan time = result.TotalIntegrationTime; - writer.WriteAttributeString("buildtime", string.Format(System.Globalization.CultureInfo.CurrentCulture,"{0:d2}:{1:d2}:{2:d2}", time.Hours, time.Minutes, time.Seconds)); + writer.WriteAttributeString("buildtime", string.Format(System.Globalization.CultureInfo.CurrentCulture, "{0:d2}:{1:d2}:{2:d2}:{3:d2}", time.Days, time.Hours, time.Minutes, time.Seconds)); if (result.Failed) { writer.WriteAttributeString("error", "true");