mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
4a936cee21
Summary: Previously, the following pattern is common in our tests: ``` $ extpath=`dirname $TESTDIR` $ cp $extpath/hgext3rd/name.py $TESTTMP # use $TESTTMP substitution in message $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTTMP/name.py > EOF ``` Now, it gets simplified to: ``` $ cat >> $HGRCPATH<<EOF > [extensions] > name=$TESTDIR/../hgext3rd/name.py > EOF ``` This removes unnecessary `dirname` and `cp`. Also fixed a regex that does not match `bytes`: ``` - transferred 268 bytes in [\d.]+ seconds \([\d.]+ KB/sec\) (re) + transferred 268 bytes in 0.3 seconds (939 bytes/sec) ``` Test Plan: arc unit Reviewers: #mercurial, phillco Reviewed By: phillco Subscribers: medson, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D5270897 Signature: t1:5270897:1497663052:bf860a0b480c751b1e4b53cebf6526193f0f6652
75 lines
2.6 KiB
Perl
75 lines
2.6 KiB
Perl
$ cat > $TESTTMP/crash.py << EOF
|
|
> from mercurial import registrar
|
|
> cmdtable = {}
|
|
> command = registrar.command(cmdtable)
|
|
> @command('crash', [])
|
|
> def crash(ui, repo):
|
|
> raise 'crash'
|
|
> EOF
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> errorredirect=$TESTDIR/../hgext3rd/errorredirect.py
|
|
> crash=$TESTTMP/crash.py
|
|
> EOF
|
|
|
|
Test errorredirect will respect original behavior by default
|
|
$ hg init
|
|
$ hg crash 2>&1 | grep -o 'Unknown exception encountered'
|
|
Unknown exception encountered
|
|
|
|
Test the errorredirect script will override stack trace output
|
|
$ hg crash --config errorredirect.script='echo overridden-message'
|
|
overridden-message
|
|
[255]
|
|
|
|
If the script returns non-zero, print the trace
|
|
$ hg crash --config errorredirect.script='echo It works && exit 1' 2>&1 | grep '^[IT]'
|
|
It works
|
|
Traceback (most recent call last):
|
|
TypeError: exceptions must be old-style classes or derived from BaseException, not str
|
|
|
|
$ printf '#!%sbin/sh\necho It works && false' '/' > a.sh
|
|
$ chmod +x $TESTTMP/a.sh
|
|
$ PATH=$TESTTMP:$PATH hg crash --config errorredirect.script=a.sh 2>&1 | grep '^[IT]'
|
|
It works
|
|
Traceback (most recent call last):
|
|
TypeError: exceptions must be old-style classes or derived from BaseException, not str
|
|
|
|
If the script is terminated by SIGTERM (Ctrl+C), do not print the trace
|
|
$ hg crash --config errorredirect.script='echo It works && kill -TERM $$' 2>&1
|
|
It works
|
|
[255]
|
|
|
|
$ printf '#!%sbin/sh\necho It works && kill -TERM $$' '/' > a.sh
|
|
$ chmod +x $TESTTMP/a.sh
|
|
$ PATH=$TESTTMP:$PATH hg crash --config errorredirect.script=a.sh 2>&1
|
|
It works
|
|
[255]
|
|
|
|
If the script cannot be executed (not found in PATH), print the trace
|
|
$ hash SCRIPT-DOES-NOT-EXIST 2>/dev/null && exit 80
|
|
[1]
|
|
$ hg crash --config errorredirect.script='SCRIPT-DOES-NOT-EXIST' 2>&1 | grep '^[IT]'
|
|
Traceback (most recent call last):
|
|
TypeError: exceptions must be old-style classes or derived from BaseException, not str
|
|
|
|
Traces are logged in blackbox
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> blackbox=
|
|
> [blackbox]
|
|
> track = command, commandexception
|
|
> logsource = 1
|
|
> EOF
|
|
|
|
$ hg blackbox -l 2
|
|
* @0000000000000000000000000000000000000000 (*) [command]> blackbox -l 2 (glob)
|
|
$ hg crash --config errorredirect.script='echo Works'
|
|
Works
|
|
[255]
|
|
$ hg blackbox -l 12 | grep '\[command'
|
|
* @0000000000000000000000000000000000000000 (*) [command]> blackbox -l 2 (glob)
|
|
* @0000000000000000000000000000000000000000 (*) [command]> crash (glob)
|
|
* @0000000000000000000000000000000000000000 (*) [commandexception]> * (glob)
|
|
* @0000000000000000000000000000000000000000 (*) [command]> blackbox -l 12 (glob)
|