fix(leaks, TCs): attempt to cleanup mman before deleting tmp-dirs

Author: ankostis

git/test/lib/helper.py

@@ -7,6 +7,7 @@
 
 import contextlib
 from functools import wraps
+import gc
 import io
 import logging
 import os
@@ -18,6 +19,7 @@
 
 from git.compat import string_types, is_win, PY3
 from git.util import rmtree, cwd
+import gitdb
 
 import os.path as osp
 
@@ -92,7 +94,6 @@ def wrapper(self):
             # a windows-only issue. In fact things should be deleted, as well as
             # memory maps closed, once objects go out of scope. For some reason
             # though this is not the case here unless we collect explicitly.
-            import gc
             gc.collect()
             if not keep:
                 rmtree(path)
@@ -140,9 +141,10 @@ def repo_creator(self):
                 os.chdir(prev_cwd)
                 rw_repo.git.clear_cache()
                 rw_repo = None
-                import gc
-                gc.collect()
                 if repo_dir is not None:
+                    gc.collect()
+                    gitdb.util.mman.collect()
+                    gc.collect()
                     rmtree(repo_dir)
                 # END rm test repo if possible
             # END cleanup
@@ -299,7 +301,8 @@ def remote_repo_creator(self):
                 rw_daemon_repo.git.clear_cache()
                 del rw_repo
                 del rw_daemon_repo
-                import gc
+                gc.collect()
+                gitdb.util.mman.collect()
                 gc.collect()
                 if rw_repo_dir:
                     rmtree(rw_repo_dir)
@@ -350,7 +353,6 @@ def setUpClass(cls):
         each test type has its own repository
         """
         from git import Repo
-        import gc
         gc.collect()
         cls.rorepo = Repo(GIT_REPO)