Merge pull request #284 from jdmansour/fix-test-env

Make tests work with different default branch, or different locale

Author: yuvipanda

nbgitpuller/pull.py

@@ -16,6 +16,9 @@ def execute_cmd(cmd, **kwargs):
     yield '$ {}\n'.format(' '.join(cmd))
     kwargs['stdout'] = subprocess.PIPE
     kwargs['stderr'] = subprocess.STDOUT
+    # Explicitly set LANG=C, as `git` commandline output will be different if
+    # the user environment has a different locale set!
+    kwargs['env'] = dict(os.environ, LANG='C')
 
     proc = subprocess.Popen(cmd, **kwargs)
 

tests/repohelpers.py

@@ -18,7 +18,7 @@ def __init__(self, path=None):
 
     def __enter__(self):
         os.makedirs(self.path, exist_ok=True)
-        self.git('init', '--bare')
+        self.git('init', '--bare', '--initial-branch=master')
         return self
 
     def __exit__(self, *args):