This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1162

tests: make test-extension.t's baduisetup.py test fail even if bdiff exists
ClosedPublic

Authored by martinvonz on Oct 17 2017, 2:24 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHGdf871c41bd00: tests: make test-extension.t's baduisetup.py test fail even if bdiff exists
Summary

A mercurial.bdiff module has existed at some point and when I have
built at an old version, some .pyc file or something seems to stick
around and test-extension.t fails. Let's remove the reference to bdiff
and simplify the test.

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-extension.t (28 lines)

Diff 2973

tests/test-extension.t

> except ImportError: > except ImportError:
> pass # intentional failure > pass # intentional failure
> EOF > EOF
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity)
Make sure a broken uisetup doesn't globally break hg: Make sure a broken uisetup doesn't globally break hg:
$ cat > $TESTTMP/baduisetup.py <<EOF $ cat > $TESTTMP/baduisetup.py <<EOF
> from mercurial import (
> bdiff,
> extensions,
> )
>
> def blockswrapper(orig, *args, **kwargs):
> return orig(*args, **kwargs)
>
> def uisetup(ui): > def uisetup(ui):
> extensions.wrapfunction(bdiff, 'blocks', blockswrapper) > 1/0
> EOF > EOF
Even though the extension fails during uisetup, hg is still basically usable: Even though the extension fails during uisetup, hg is still basically usable:
$ hg --config extensions.baduisetup=$TESTTMP/baduisetup.py version $ hg --config extensions.baduisetup=$TESTTMP/baduisetup.py version
\*\*\* failed to set up extension baduisetup: No module named (mercurial\.)?bdiff (re) *** failed to set up extension baduisetup: integer division or modulo by zero
Mercurial Distributed SCM (version *) (glob) Mercurial Distributed SCM (version *) (glob)
(see https://mercurial-scm.org for more information) (see https://mercurial-scm.org for more information)
Copyright (C) 2005-2017 Matt Mackall and others Copyright (C) 2005-2017 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ hg --config extensions.baduisetup=$TESTTMP/baduisetup.py version --traceback $ hg --config extensions.baduisetup=$TESTTMP/baduisetup.py version --traceback
Traceback (most recent call last): Traceback (most recent call last):
File "*/mercurial/extensions.py", line *, in _runuisetup (glob) File "*/mercurial/extensions.py", line *, in _runuisetup (glob)
uisetup(ui) uisetup(ui)
File "$TESTTMP/baduisetup.py", line 10, in uisetup File "$TESTTMP/baduisetup.py", line 2, in uisetup
extensions.wrapfunction(bdiff, 'blocks', blockswrapper) 1/0
File "*/mercurial/extensions.py", line *, in wrapfunction (glob) ZeroDivisionError: integer division or modulo by zero
origfn = getattr(container, funcname) *** failed to set up extension baduisetup: integer division or modulo by zero
File "*/hgdemandimport/demandimportpy2.py", line *, in __getattr__ (glob)
self._load()
File "*/hgdemandimport/demandimportpy2.py", line *, in _load (glob)
mod = _hgextimport(_origimport, head, globals, locals, None, level)
File "*/hgdemandimport/demandimportpy2.py", line *, in _hgextimport (glob)
return importfunc(name, globals, *args, **kwargs)
ImportError: No module named (mercurial\.)?bdiff (re)
\*\*\* failed to set up extension baduisetup: No module named (mercurial\.)?bdiff (re)
Mercurial Distributed SCM (version *) (glob) Mercurial Distributed SCM (version *) (glob)
(see https://mercurial-scm.org for more information) (see https://mercurial-scm.org for more information)
Copyright (C) 2005-2017 Matt Mackall and others Copyright (C) 2005-2017 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#endif #endif