Skip to content

Commit 5149c80

Browse files
committed
Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ankostis-win_mmap
2 parents 8c3a688 + 9db2ff1 commit 5149c80

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

Diff for: git/test/performance/test_odb.py

-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
import sys
55
from time import time
6-
from unittest.case import skipIf
7-
8-
from git.compat import PY3
9-
from git.util import HIDE_WINDOWS_KNOWN_ERRORS
106

117
from .lib import (
128
TestBigRepoR
@@ -15,8 +11,6 @@
1511

1612
class TestObjDBPerformance(TestBigRepoR):
1713

18-
@skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3,
19-
"FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")
2014
def test_random_access(self):
2115
results = [["Iterate Commits"], ["Iterate Blobs"], ["Retrieve Blob Data"]]
2216
for repo in (self.gitrorepo, self.puregitrorepo):

Diff for: git/test/test_repo.py

-2
Original file line numberDiff line numberDiff line change
@@ -808,8 +808,6 @@ def test_git_file(self, rwrepo):
808808
git_file_repo = Repo(rwrepo.working_tree_dir)
809809
self.assertEqual(osp.abspath(git_file_repo.git_dir), real_path_abs)
810810

811-
@skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3,
812-
"FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly")
813811
def test_file_handle_leaks(self):
814812
def last_commit(repo, rev, path):
815813
commit = next(repo.iter_commits(rev, path, max_count=1))

Diff for: git/test/test_submodule.py

+1-15
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import git
99
from git.cmd import Git
10-
from git.compat import string_types, is_win
10+
from git.compat import string_types
1111
from git.exc import (
1212
InvalidGitRepositoryError,
1313
RepositoryDirtyError
@@ -28,20 +28,6 @@
2828
import os.path as osp
2929

3030

31-
# Change the configuration if possible to prevent the underlying memory manager
32-
# to keep file handles open. On windows we get problems as they are not properly
33-
# closed due to mmap bugs on windows (as it appears)
34-
if is_win:
35-
try:
36-
import smmap.util # @UnusedImport
37-
smmap.util.MapRegion._test_read_into_memory = True
38-
except ImportError:
39-
sys.stderr.write("The submodule tests will fail as some files cannot be removed due to open file handles.\n")
40-
sys.stderr.write(
41-
"The latest version of gitdb uses a memory map manager which can be configured to work around this problem")
42-
# END handle windows platform
43-
44-
4531
class TestRootProgress(RootUpdateProgress):
4632

4733
"""Just prints messages, for now without checking the correctness of the states"""

0 commit comments

Comments
 (0)