Move test to install_uninstall test so environment variables apply

asottile · asottile · commit 0bb8a8fabe9d · 2020-01-16T13:02:20.000-08:00
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -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:
diff --git a/pre_commit/main.py b/pre_commit/main.py
@@ -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',
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
@@ -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()
diff --git a/testing/util.py b/testing/util.py
@@ -67,8 +67,8 @@ def run_opts(
         hook=None,
         origin='',
         source='',
-        push_remote_name='',
-        push_remote_url='',
+        remote_name='',
+        remote_url='',
         hook_stage='commit',
         show_diff_on_failure=False,
         commit_msg_filename='',
@@ -83,8 +83,8 @@ def run_opts(
         hook=hook,
         origin=origin,
         source=source,
-        push_remote_name=push_remote_name,
-        push_remote_url=push_remote_url,
+        remote_name=remote_name,
+        remote_url=remote_url,
         hook_stage=hook_stage,
         show_diff_on_failure=show_diff_on_failure,
         commit_msg_filename=commit_msg_filename,
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -15,6 +15,7 @@
 from pre_commit.util import cmd_output
 from pre_commit.util import make_executable
 from pre_commit.util import resource_text
+from testing.fixtures import add_config_to_repo
 from testing.fixtures import git_dir
 from testing.fixtures import make_consuming_repo
 from testing.fixtures import remove_config_from_repo
@@ -512,9 +513,9 @@ def test_installed_from_venv(tempdir_factory, store):
         assert NORMAL_PRE_COMMIT_RUN.match(output)
 
 
-def _get_push_output(tempdir_factory, opts=()):
+def _get_push_output(tempdir_factory, remote='origin', opts=()):
     return cmd_output_mocked_pre_commit_home(
-        'git', 'push', 'origin', 'HEAD:new_branch', *opts,
+        'git', 'push', remote, 'HEAD:new_branch', *opts,
         tempdir_factory=tempdir_factory,
         retcode=None,
     )[:2]
@@ -589,6 +590,33 @@ def test_pre_push_new_upstream(tempdir_factory, store):
         assert 'Passed' in output
 
 
+def test_pre_push_environment_variables(tempdir_factory, store):
+    config = {
+        'repo': 'local',
+        'hooks': [
+            {
+                'id': 'print-remote-info',
+                'name': 'print remote info',
+                'entry': 'bash -c "echo remote: $PRE_COMMIT_REMOTE_NAME"',
+                'language': 'system',
+                'verbose': True,
+            },
+        ],
+    }
+
+    upstream = git_dir(tempdir_factory)
+    clone = tempdir_factory.get()
+    cmd_output('git', 'clone', upstream, clone)
+    add_config_to_repo(clone, config)
+    with cwd(clone):
+        install(C.CONFIG_FILE, store, hook_types=['pre-push'])
+
+        cmd_output('git', 'remote', 'rename', 'origin', 'origin2')
+        retc, output = _get_push_output(tempdir_factory, remote='origin2')
+        assert retc == 0
+        assert '\nremote: origin2\n' in output
+
+
 def test_pre_push_integration_empty_push(tempdir_factory, store):
     upstream = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
     path = tempdir_factory.get()
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -456,8 +456,11 @@ def test_origin_source_error_msg_error(
     assert b'Specify both --origin and --source.' in printed
 
 
-def test_origin_source_both_ok(cap_out, store, repo_with_passing_hook):
-    args = run_opts(origin='master', source='master')
+def test_all_push_options_ok(cap_out, store, repo_with_passing_hook):
+    args = run_opts(
+        origin='master', source='master',
+        remote_name='origin', remote_url='https://example.com/repo',
+    )
     ret, printed = _do_run(cap_out, store, repo_with_passing_hook, args)
     assert ret == 0
     assert b'Specify both --origin and --source.' not in printed
@@ -687,35 +690,6 @@ def _run_for_stage(stage):
     assert _run_for_stage('commit-msg').startswith(b'hook 5...')
 
 
-def test_push_remote_environment(cap_out, store, repo_with_passing_hook):
-    config = {
-        'repo': 'local',
-        'hooks': [
-            {
-                'id': 'print-push-remote',
-                'name': 'Print push remote name',
-                'entry': 'entry: bash -c \'echo "$PRE_COMMIT_REMOTE_NAME"\'',
-                'language': 'system',
-                'verbose': bool(1),
-            },
-        ],
-    }
-    add_config_to_repo(repo_with_passing_hook, config)
-
-    _test_run(
-        cap_out,
-        store,
-        repo_with_passing_hook,
-        opts={
-            'push_remote_name': 'origin',
-            'push_remote_url': 'https://github.com/pre-commit/pre-commit',
-        },
-        expected_outputs=[b'Print push remote name', b'Passed'],
-        expected_ret=0,
-        stage=['push'],
-    )
-
-
 def test_commit_msg_hook(cap_out, store, commit_msg_repo):
     filename = '.git/COMMIT_EDITMSG'
     with open(filename, 'w') as f:

Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,9 @@ def _add_run_options(parser: argparse.ArgumentParser) -> None:`
`102`	`102`	help='Filename to check when running during `commit-msg`',
`103`	`103`	`)`
`104`	`104`	`parser.add_argument(`
`105`		- '--push-remote-name', help='Remote name used by `git push`.',
`106`		`- )`
`107`		`- parser.add_argument(`
`108`		- '--push-remote-url', help='Remote url used by `git push`.',
	`105`	+ '--remote-name', help='Remote name used by `git push`.',
`109`	`106`	`)`
	`107`	+ parser.add_argument('--remote-url', help='Remote url used by `git push`.')
`110`	`108`	`parser.add_argument(`
`111`	`109`	`'--hook-stage', choices=C.STAGES, default='commit',`
`112`	`110`	`help='The stage during which the hook is fired. One of %(choices)s',`