summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-03-04 23:26:43 +0200
committerLars Wirzenius <liw@liw.fi>2017-03-04 23:26:43 +0200
commite2b1eef719cd2d608836d4ef70759dc58c3f9660 (patch)
tree1a4a1a314df72e8ce355435bd1d999ad4f31e0b7
parentd26502a1862ccc55a869327f7ed7989d1a8e081b (diff)
downloadgit.liw.fi-ruleset-tests-e2b1eef719cd2d608836d4ef70759dc58c3f9660.tar.gz
Add a .git_as_checked method
-rw-r--r--000.yarn6
-rw-r--r--yarnhelper.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/000.yarn b/000.yarn
index c951972..4f3bf3e 100644
--- a/000.yarn
+++ b/000.yarn
@@ -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 = [