From 93a0feadb737d8c3271f57895c6192f401befb79 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 4 Mar 2017 23:37:18 +0200 Subject: Refactor to make use off .git_as or .git_as_checked --- 000.yarn | 11 +++-------- yarnhelper.py | 9 +++++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/000.yarn b/000.yarn index b40cf0f..2140e0e 100644 --- a/000.yarn +++ b/000.yarn @@ -330,19 +330,14 @@ groups, and respositories. repo = helper.get_next_match() url = helper.repo_ssh_url(repo) dirname = helper.local_checkout_dirname(user, repo) - env = dict(os.environ) - env['GIT_SSH_COMMAND'] = helper.env_ssh_command(user) - cliapp.runcmd(['git', 'push', '--all', 'origin'], cwd=dirname, env=env) - + helper.git_as_checked(user, ['push', '--all', 'origin'], cwd=dirname) IMPLEMENTS THEN (\S+) cannot push (\S+) user = helper.get_next_match() repo = helper.get_next_match() dirname = helper.local_checkout_dirname(user, repo) - env = dict(os.environ) - env['GIT_SSH_COMMAND'] = helper.env_ssh_command(user) - exit, out, err = cliapp.runcmd_unchecked( - ['git', 'push', '--all', 'origin'], cwd=dirname, env=env) + exit, out, err = helper.git_as(user, + ['push', '--all', 'origin'], cwd=dirname) sys.stdout.write(out) sys.stderr.write(err) helper.assertNotEqual(exit, 0) diff --git a/yarnhelper.py b/yarnhelper.py index a1a95ea..d132b88 100644 --- a/yarnhelper.py +++ b/yarnhelper.py @@ -150,17 +150,18 @@ class YarnHelper(object): def local_checkout_dirname(self, user, repo): # pragma: no cover return '{}_{}'.format(user, repo) - def git_as(self, user, args): # pragma: no cover + def git_as(self, user, args, **kwargs): # pragma: no cover server = os.environ['GITANO_SERVER'] env = dict(os.environ) env['GIT_SSH_COMMAND'] = self.env_ssh_command(user) return cliapp.runcmd_unchecked( ['git'] + args, stderr=subprocess.STDOUT, - env=env) + env=env, + **kwargs) - def git_as_checked(self, user, args): # pragma: no cover - exit, out, err = self.git_as(user, args) + def git_as_checked(self, user, args, **kwargs): # pragma: no cover + exit, out, err = self.git_as(user, args, **kwargs) self.assertEqual(exit, 0) def env_ssh_command(self, user): # pragma: no cover -- cgit v1.2.1