This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7126

tests: use time.time() for relative start and stop times
ClosedPublic

Authored by indygreg on Oct 17 2019, 1:12 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGac140b85aae9: tests: use time.time() for relative start and stop times
Summary

os.times() does not work on Windows. This was resulting in the
test start, stop, and duration times being reported as 0.

This commit swaps in time.time() for wall clock measurements.

This isn't ideal, as time.time() is not monotonic. But Python 2.7
does not have a monotonic timer that works on Windows. So it is
the best we have which is trivially usable. And test times aren't
terribly important, so variances due to clock skew are arguably
acceptable.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Oct 17 2019, 1:12 AM
pulkit accepted this revision.Nov 11 2019, 6:48 AM
This revision is now accepted and ready to land.Nov 11 2019, 6:48 AM

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (14 lines)

Diff 18013

tests/run-tests.py

return accepted return accepted
def startTest(self, test): def startTest(self, test):
super(TestResult, self).startTest(test) super(TestResult, self).startTest(test)
# os.times module computes the user time and system time spent by # os.times module computes the user time and system time spent by
# child's processes along with real elapsed time taken by a process. # child's processes along with real elapsed time taken by a process.
# This module has one limitation. It can only work for Linux user # This module has one limitation. It can only work for Linux user
# and not for Windows. # and not for Windows. Hence why we fall back to another function
# for wall time calculations.
test.started_times = os.times() test.started_times = os.times()
# TODO use a monotonic clock once support for Python 2.7 is dropped.
test.started_time = time.time()
if self._firststarttime is None: # thread racy but irrelevant if self._firststarttime is None: # thread racy but irrelevant
self._firststarttime = test.started_times[4] self._firststarttime = test.started_time
def stopTest(self, test, interrupted=False): def stopTest(self, test, interrupted=False):
super(TestResult, self).stopTest(test) super(TestResult, self).stopTest(test)
test.stopped_times = os.times() test.stopped_times = os.times()
stopped_time = time.time()
starttime = test.started_times starttime = test.started_times
endtime = test.stopped_times endtime = test.stopped_times
origin = self._firststarttime origin = self._firststarttime
self.times.append( self.times.append(
( (
test.name, test.name,
endtime[2] - starttime[2], # user space CPU time endtime[2] - starttime[2], # user space CPU time
endtime[3] - starttime[3], # sys space CPU time endtime[3] - starttime[3], # sys space CPU time
endtime[4] - starttime[4], # real time stopped_time - test.started_time, # real time
starttime[4] - origin, # start date in run context test.started_time - origin, # start date in run context
endtime[4] - origin, # end date in run context stopped_time - origin, # end date in run context
) )
) )
if interrupted: if interrupted:
with iolock: with iolock:
self.stream.writeln( self.stream.writeln(
'INTERRUPTED: %s (after %d seconds)' 'INTERRUPTED: %s (after %d seconds)'
% (test.name, self.times[-1][3]) % (test.name, self.times[-1][3])