Move test to install_uninstall test so environment variables apply

This commit is contained in:
Anthony Sottile 2020-01-16 09:55:46 -08:00
parent 57cc814b8b
commit 0bb8a8fabe
6 changed files with 46 additions and 47 deletions

View file

@ -312,9 +312,9 @@ def run(
environ['PRE_COMMIT_ORIGIN'] = args.origin
environ['PRE_COMMIT_SOURCE'] = args.source
if args.push_remote_name and args.push_remote_url:
environ['PRE_COMMIT_REMOTE_NAME'] = args.push_remote_name
environ['PRE_COMMIT_REMOTE_URL'] = args.push_remote_url
if args.remote_name and args.remote_url:
environ['PRE_COMMIT_REMOTE_NAME'] = args.remote_name
environ['PRE_COMMIT_REMOTE_URL'] = args.remote_url
with contextlib.ExitStack() as exit_stack:
if stash:

View file

@ -102,11 +102,9 @@ def _add_run_options(parser: argparse.ArgumentParser) -> None:
help='Filename to check when running during `commit-msg`',
)
parser.add_argument(
'--push-remote-name', help='Remote name used by `git push`.',
)
parser.add_argument(
'--push-remote-url', help='Remote url used by `git push`.',
'--remote-name', help='Remote name used by `git push`.',
)
parser.add_argument('--remote-url', help='Remote url used by `git push`.')
parser.add_argument(
'--hook-stage', choices=C.STAGES, default='commit',
help='The stage during which the hook is fired. One of %(choices)s',

View file

@ -151,10 +151,9 @@ def _pre_push(stdin: bytes) -> Tuple[str, ...]:
opts = ('--origin', local_sha, '--source', source)
if opts:
remote_opts = (
'--push-remote-name', remote_name, '--push-remote-url', remote_url,
return (
*opts, '--remote-name', remote_name, '--remote-url', remote_url,
)
return opts + remote_opts
else:
# An attempt to push an empty changeset
raise EarlyExit()