diff options
| -rw-r--r-- | 000.yarn | 6 | ||||
| -rw-r--r-- | yarnhelper.py | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -267,8 +267,7 @@ groups, and respositories. user = 'admin' url = helper.repo_ssh_url(repo) dirname = helper.local_checkout_dirname(user, repo) - exit, out, err = helper.git_as(None, ['clone', url, dirname]) - helper.assertEqual(exit, 0) + helper.git_as_checked(None, ['clone', url, dirname]) env = dict(os.environ) env['GIT_SSH_COMMAND'] = helper.env_ssh_command(None) cliapp.runcmd(['git', 'config', 'user.email', user], cwd=dirname, env=env) @@ -290,8 +289,7 @@ groups, and respositories. repo = helper.get_next_match() url = helper.repo_ssh_url(repo) dirname = helper.local_checkout_dirname(user, repo) - exit, out, err = helper.git_as(user, ['clone', url, dirname]) - helper.assertEqual(exit, 0) + helper.git_as_checked(user, ['clone', url, dirname]) env = dict(os.environ) env['GIT_SSH_COMMAND'] = helper.env_ssh_command(user) cliapp.runcmd(['git', 'config', 'user.email', user], cwd=dirname, env=env) diff --git a/yarnhelper.py b/yarnhelper.py index 069387c..a1a95ea 100644 --- a/yarnhelper.py +++ b/yarnhelper.py @@ -158,6 +158,10 @@ class YarnHelper(object): ['git'] + args, stderr=subprocess.STDOUT, env=env) + + def git_as_checked(self, user, args): # pragma: no cover + exit, out, err = self.git_as(user, args) + self.assertEqual(exit, 0) def env_ssh_command(self, user): # pragma: no cover argv = [ |