This is an archive of the discontinued Mercurial Phabricator instance.

Differential D199

tests: make test-profile.t pass if statprof didn't collect samples
ClosedPublic

Authored by martinvonz on Jul 31 2017, 3:45 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa72b2db1a6a9: tests: make test-profile.t pass if statprof didn't collect samples
Summary

We had the first 3 tests in test-profile.t fail because the output
didn't match. I have not yet confirmed that this was because no
samples were collected, but we shouldn't require samples to be
collected for the test to pass either way.

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

martinvonz created this revision.Jul 31 2017, 3:45 PM
durin42 accepted this revision.Jul 31 2017, 5:33 PM
durin42 added a subscriber: durin42.

Looking at https://launchpadlibrarian.net/331265805/buildlog_ubuntu-xenial-amd64.mercurial_4.3~rc+34-xenial-806351695c6a_BUILDING.txt.gz this has happened outside of Google's environment too, so accepting. :)

This revision is now accepted and ready to land.Jul 31 2017, 5:33 PM
Closed by commit rHGa72b2db1a6a9: tests: make test-profile.t pass if statprof didn't collect samples (authored by martinvonz). · Explain WhyJul 31 2017, 6:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-profile.t (25 lines)

Diff 466

tests/test-profile.t

test --time test --time
$ hg --time help -q help 2>&1 | grep time > /dev/null $ hg --time help -q help 2>&1 | grep time > /dev/null
$ hg init a $ hg init a
$ cd a $ cd a
Function to check that statprof ran
$ statprofran () {
> egrep 'Sample count:|No samples recorded' > /dev/null
> }
test --profile test --profile
$ hg st --profile 2>&1 | grep Sample $ hg st --profile 2>&1 | statprofran
Sample count: \d+ (re)
Abreviated version Abreviated version
$ hg st --prof 2>&1 | grep Sample $ hg st --prof 2>&1 | statprofran
Sample count: \d+ (re)
In alias In alias
$ hg --config "alias.profst=status --profile" profst 2>&1 | grep Sample $ hg --config "alias.profst=status --profile" profst 2>&1 | statprofran
Sample count: \d+ (re)
#if lsprof #if lsprof
$ prof='hg --config profiling.type=ls --profile' $ prof='hg --config profiling.type=ls --profile'
$ $prof st 2>../out $ $prof st 2>../out
$ grep CallCount ../out > /dev/null || cat ../out $ grep CallCount ../out > /dev/null || cat ../out
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> sleep = `pwd`/sleepext.py > sleep = `pwd`/sleepext.py
> EOF > EOF
statistical profiler works statistical profiler works
$ hg --profile sleep 2>../out $ hg --profile sleep 2>../out
$ grep Sample ../out $ cat ../out | statprofran
Sample count: \d+ (re)
Various statprof formatters work Various statprof formatters work
$ hg --profile --config profiling.statformat=byline sleep 2>../out $ hg --profile --config profiling.statformat=byline sleep 2>../out
$ head -n 1 ../out $ head -n 1 ../out
% cumulative self % cumulative self
$ grep Sample ../out $ cat ../out | statprofran
Sample count: \d+ (re)
$ hg --profile --config profiling.statformat=bymethod sleep 2>../out $ hg --profile --config profiling.statformat=bymethod sleep 2>../out
$ head -n 1 ../out $ head -n 1 ../out
% cumulative self % cumulative self
$ grep Sample ../out $ cat ../out | statprofran
Sample count: \d+ (re)
$ hg --profile --config profiling.statformat=hotpath sleep 2>../out $ hg --profile --config profiling.statformat=hotpath sleep 2>../out
$ grep Sample ../out $ cat ../out | statprofran
Sample count: \d+ (re)
$ hg --profile --config profiling.statformat=json sleep 2>../out $ hg --profile --config profiling.statformat=json sleep 2>../out
$ cat ../out $ cat ../out
\[\[-?\d+.* (re) \[\[-?\d+.* (re)
statprof can be used as a standalone module statprof can be used as a standalone module
$ $PYTHON -m mercurial.statprof hotpath $ $PYTHON -m mercurial.statprof hotpath