# HG changeset patch # User Saurabh Singh # Date 2017-10-03 21:35:24 # Node ID 26c879bbf4eeb98d8c70b2663dc913b6d98d0b19 # Parent 533f329371828b58d0d064797562d16f8e2be325 test-hook: make test compatible with chg The test uses the 'print' method instead of writing to stdout using 'ui.write' which leads to incompatibility with chg. This commit modifies the test to use 'ui' instead which fixes the problem. Test Plan: Ran the test 'test-hook.t' with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D927 diff --git a/tests/test-hook.t b/tests/test-hook.t --- a/tests/test-hook.t +++ b/tests/test-hook.t @@ -413,20 +413,18 @@ preoutgoing hook can prevent outgoing ch > > uncallable = 0 > - > def printargs(args): - > args.pop('ui', None) - > args.pop('repo', None) + > def printargs(ui, args): > a = list(args.items()) > a.sort() - > print('hook args:') + > ui.write('hook args:\n') > for k, v in a: - > print(' ', k, v) + > ui.write(' %s %s\n' % (k, v)) > - > def passhook(**args): - > printargs(args) + > def passhook(ui, repo, **args): + > printargs(ui, args) > - > def failhook(**args): - > printargs(args) + > def failhook(ui, repo, **args): + > printargs(ui, args) > return True > > class LocalException(Exception): @@ -445,7 +443,7 @@ preoutgoing hook can prevent outgoing ch > ui.note('verbose output from hook\n') > > def printtags(ui, repo, **args): - > print(sorted(repo.tags())) + > ui.write('%s\n' % sorted(repo.tags())) > > class container: > unreachable = 1 @@ -629,8 +627,8 @@ make sure --traceback works $ cd c $ cat > hookext.py < def autohook(**args): - > print("Automatically installed hook") + > def autohook(ui, **args): + > ui.write('Automatically installed hook\n') > > def reposetup(ui, repo): > repo.ui.setconfig("hooks", "commit.auto", autohook) @@ -666,8 +664,8 @@ test python hook configured with python: $ cd hooks $ cat > testhooks.py < def testhook(**args): - > print('hook works') + > def testhook(ui, **args): + > ui.write('hook works\n') > EOF $ echo '[hooks]' > ../repo/.hg/hgrc $ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc