Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ankostis-win_mmap

Byron · Byron · commit 5149c807ec5f · 2016-10-22T16:41:31.000+02:00
diff --git a/git/test/performance/test_odb.py b/git/test/performance/test_odb.py
@@ -3,10 +3,6 @@
 
 import sys
 from time import time
-from unittest.case import skipIf
-
-from git.compat import PY3
-from git.util import HIDE_WINDOWS_KNOWN_ERRORS
 
 from .lib import (
     TestBigRepoR
@@ -15,8 +11,6 @@
 
 class TestObjDBPerformance(TestBigRepoR):
 
-    @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3,
-            "FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")
     def test_random_access(self):
         results = [["Iterate Commits"], ["Iterate Blobs"], ["Retrieve Blob Data"]]
         for repo in (self.gitrorepo, self.puregitrorepo):
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
@@ -808,8 +808,6 @@ def test_git_file(self, rwrepo):
         git_file_repo = Repo(rwrepo.working_tree_dir)
         self.assertEqual(osp.abspath(git_file_repo.git_dir), real_path_abs)
 
-    @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3,
-            "FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")
     def test_file_handle_leaks(self):
         def last_commit(repo, rev, path):
             commit = next(repo.iter_commits(rev, path, max_count=1))
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -7,7 +7,7 @@
 
 import git
 from git.cmd import Git
-from git.compat import string_types, is_win
+from git.compat import string_types
 from git.exc import (
     InvalidGitRepositoryError,
     RepositoryDirtyError
@@ -28,20 +28,6 @@
 import os.path as osp
 
 
-# Change the configuration if possible to prevent the underlying memory manager
-# to keep file handles open. On windows we get problems as they are not properly
-# closed due to mmap bugs on windows (as it appears)
-if is_win:
-    try:
-        import smmap.util  # @UnusedImport
-        smmap.util.MapRegion._test_read_into_memory = True
-    except ImportError:
-        sys.stderr.write("The submodule tests will fail as some files cannot be removed due to open file handles.\n")
-        sys.stderr.write(
-            "The latest version of gitdb uses a memory map manager which can be configured to work around this problem")
-# END handle windows platform
-
-
 class TestRootProgress(RootUpdateProgress):
 
     """Just prints messages, for now without checking the correctness of the states"""
