Some refactoring, put all os.environ-cleaning functionality in TestCase.setUp().

dulwich/tests/__init__.py

@@ -35,6 +35,7 @@ else:
     import unittest2 as unittest
     from unittest2 import SkipTest, TestCase as _TestCase
 
+
 def get_safe_env(env=None):
     """Returns the environment "env" (or a copy of "os.environ" by default)
     modified to avoid side-effects caused by user's ~/.gitconfig"""
@@ -48,17 +49,28 @@ def get_safe_env(env=None):
         env[e] = '/nosuchdir'
     return env
 
+
 class TestCase(_TestCase):
+
     def makeSafeEnv(self):
-        """Modifies "os.environ" for the duration of a test case to avoid
-        side-effects caused by user's ~/.gitconfig"""
-
-        for e in 'HOME', 'HOMEPATH', 'USERPROFILE':
-            if e in os.environ:
-                self.addCleanup(os.environ.__setitem__, e, os.environ[e])
-            else:
-                self.addCleanup(os.environ.__delitem__, e)
-            os.environ[e] = '/nosuchdir'
+        """Create environment with homedirectory-related variables stripped.
+
+        Modifies os.environ for the duration of a test case to avoid
+        side-effects caused by the user's ~/.gitconfig and other
+        files in their home directory.
+        """
+        old_env = os.environ
+        def restore():
+            os.environ = old_env
+        self.addCleanup(restore)
+        new_env = dict(os.environ)
+        for e in ['HOME', 'HOMEPATH', 'USERPROFILE']:
+            new_env[e] = '/nosuchdir'
+        os.environ = new_env
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+        self.makeSafeEnv()
 
 
 class BlackboxTestCase(TestCase):

dulwich/tests/compat/test_client.py

@@ -286,7 +286,6 @@ class DulwichSubprocessClientTest(CompatTestCase, DulwichClientTestBase):
     def setUp(self):
         CompatTestCase.setUp(self)
         DulwichClientTestBase.setUp(self)
-        self.makeSafeEnv()
 
     def tearDown(self):
         DulwichClientTestBase.tearDown(self)

dulwich/tests/test_config.py

@@ -31,7 +31,6 @@ from dulwich.config import (
     _unescape_value,
     )
 from dulwich.tests import TestCase
-import os
 
 
 class ConfigFileTests(TestCase):
@@ -175,7 +174,6 @@ class ConfigDictTests(TestCase):
 class StackedConfigTests(TestCase):
 
     def test_default_backends(self):
-        self.makeSafeEnv()
         StackedConfig.default_backends()
 
 

dulwich/tests/test_repository.py

@@ -320,7 +320,6 @@ class RepositoryTests(TestCase):
         self.assertIsInstance(r.get_config(), Config)
 
     def test_get_config_stack(self):
-        self.makeSafeEnv()
         r = self._repo = open_repo('ooo_merge.git')
         self.assertIsInstance(r.get_config_stack(), Config)
 
@@ -459,7 +458,6 @@ class BuildRepoTests(TestCase):
         self.assertEqual("iso8859-1", r[commit_sha].encoding)
 
     def test_commit_config_identity(self):
-        self.makeSafeEnv()
         # commit falls back to the users' identity if it wasn't specified
         r = self._repo
         c = r.get_config()