mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-08 01:26:03 +00:00
Hudson renders durations in milliseconds if the total duration is very short.
(<a href="http://www.nabble.com/Unit-tests-duration-in-milliseconds-tt21417767.html">report</a>) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14409 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
e1153d511c
commit
759d4d90d2
3 files changed
+20
-2
No files matched your search
@@ -487,6 +487,8 @@ public class Util {
|
||||
long minutes = duration / ONE_MINUTE_MS;
|
||||
duration %= ONE_MINUTE_MS;
|
||||
long seconds = duration / ONE_SECOND_MS;
|
||||
duration %= ONE_SECOND_MS;
|
||||
long millisecs = duration;
|
||||
|
||||
if (years > 0)
|
||||
return makeTimeSpanString(years, Messages.Util_year(years), months, Messages.Util_month(months));
|
||||
@@ -498,9 +500,14 @@ public class Util {
|
||||
return makeTimeSpanString(hours, Messages.Util_hour(hours), minutes, Messages.Util_minute(minutes));
|
||||
else if (minutes > 0)
|
||||
return makeTimeSpanString(minutes, Messages.Util_minute(minutes), seconds, Messages.Util_second(seconds));
|
||||
else
|
||||
// Durations less than a minute are only expressed in seconds (no ms).
|
||||
else if (seconds >= 10)
|
||||
return Messages.Util_second(seconds);
|
||||
else if (seconds >= 1)
|
||||
return Messages.Util_second(seconds+"."+millisecs/100); // render "1.2 sec"
|
||||
else if(millisecs>=100)
|
||||
return Messages.Util_second(String.format("0.%02d",millisecs/10)); // render "0.12 sec".
|
||||
else
|
||||
return Messages.Util_millisecond(millisecs);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user