Merge pull request #827 from jmchilton/isolated

More isolated, robust git tests part 2?

Author: jmchilton

.travis.yml

@@ -15,9 +15,6 @@ env:
   - TOX_ENV=py27-lint-docstrings
 
 install:
-  # Setup git to allow git operations.
-  - git config --global user.name "Travis Test User"
-  - git config --global user.email "[email protected]"
   - pip install tox coveralls
 
 matrix:

tests/test_shed_upload.py

@@ -113,21 +113,22 @@ def test_update_with_force_create(self):
 
     def test_tar_from_git(self):
         with self._isolate() as f:
-            dest = join(f, "single_tool")
-            self._copy_repo("single_tool", dest)
-            shell(" && ".join([
-                "cd %s" % dest,
-                "git init",
-                "git add .",
-                "git commit -m 'initial commit'"
-            ]))
-            upload_command = [
-                "shed_update", "--force_repository_creation",
-                "git+single_tool/.git"
-            ]
-            upload_command.extend(self._shed_args())
-            self._check_exit_code(upload_command)
-            self._verify_single_uploaded(f, ["single_tool"])
+            with modify_environ({"GIT_AUTHOR_NAME": "planemo developer", "EMAIL": "[email protected]"}):
+                dest = join(f, "single_tool")
+                self._copy_repo("single_tool", dest)
+                shell(" && ".join([
+                    "cd %s" % dest,
+                    "git init",
+                    "git add .",
+                    "git commit -m 'initial commit'"
+                ]))
+                upload_command = [
+                    "shed_update", "--force_repository_creation",
+                    "git+single_tool/.git"
+                ]
+                upload_command.extend(self._shed_args())
+                self._check_exit_code(upload_command)
+                self._verify_single_uploaded(f, ["single_tool"])
 
     def test_upload_from_git(self):
         with self._isolate() as f: