Avoid test failure due to git hooks

If user has some default git hooks configured,
running tests could fail. This disables git hooks
while running tests.

Change-Id: If1f80448f4b9210f78ca858bb05bf1071e2e4144

Author: ssbarnea

rdopkg/utils/cmd.py

@@ -2,6 +2,7 @@
 from builtins import str
 
 import json
+import os
 import re
 import subprocess
 
@@ -43,6 +44,7 @@ def run(cmd, *params, **kwargs):
     print_stdout = kwargs.get('print_stdout', False)
     print_stderr = kwargs.get('print_stderr', False)
     print_output = kwargs.get('print_output', False)
+    env = kwargs.get('env', None)
 
     cmd = [cmd] + list(params)
     cmd_str = ' '.join(cmd)
@@ -69,7 +71,7 @@ def run(cmd, *params, **kwargs):
 
     try:
         prc = subprocess.Popen(cmd, stdin=stdin, stdout=stdout,
-                               stderr=stderr)
+                               stderr=stderr, env=env)
     except OSError:
         raise exception.CommandNotFound(cmd=cmd[0])
     out, err = prc.communicate(input=input)
@@ -114,6 +116,16 @@ def __call__(self, *params, **kwargs):
 class Git(ShellCommand):
     command = "git"
 
+    def __call__(self, *params, **kwargs):
+        # allows us to run git in isolated mode, avoiding interaction with user
+        # specific config, like ~/.git-templates/hooks (used for testing)
+        if kwargs.get('isolated', False):
+            env = kwargs.get('env', os.environ.copy())
+            env['GIT_CONFIG_NOSYSTEM'] = '1'
+            env['GIT_CONFIG_NOGLOBAL'] = '1'
+            kwargs['env'] = env
+        return run(self.command, *params, **kwargs)
+
     def create_branch_from_remote(self, branch, remote_branch=None):
         lbr = self.local_branches()
         if branch in lbr or remote_branch in lbr:

tests/test_common.py

@@ -47,7 +47,8 @@ def prep_spec_test(tmpdir, distgit):
     with dist_path.as_cwd():
         git('init')
         git('add', '.')
-        git('commit', '-m', 'Initial import')
+        git('commit', '-m', 'Initial import',
+            isolated=True)
     return dist_path
 
 
@@ -57,7 +58,8 @@ def prep_patches_branch(tag='1.2.3'):
     f.write("#not really a patch\n")
     f.close()
     git('add', 'foofile')
-    git('commit', '-m', 'Create this test branch')
+    git('commit', '-m', 'Create this test branch',
+        isolated=True)
     if tag:
         git('tag', tag)
     git('checkout', 'master')
@@ -68,7 +70,8 @@ def do_patch(fn, content, msg):
     f.write(content)
     f.close()
     git('add', fn)
-    git('commit', '-m', msg)
+    git('commit', '-m', msg,
+        isolated=True)
 
 
 def add_patches(extra=False, filtered=False, tag=None):