Commit 5149c80
committed
Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ankostis-win_mmap
3 files changed
Lines changed: 1 addition & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,10 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | 4 | import sys | |
| 5 | 5 | 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 | ||
| 10 | 6 | ||
| 11 | 7 | from .lib import ( | |
| 12 | 8 | TestBigRepoR | |
@@ -15,8 +11,6 @@ | |||
| 15 | 11 | ||
| 16 | 12 | class TestObjDBPerformance(TestBigRepoR): | |
| 17 | 13 | ||
| 18 | - @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3, | ||
| 19 | - "FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly") | ||
| 20 | 14 | def test_random_access(self): | |
| 21 | 15 | results = [["Iterate Commits"], ["Iterate Blobs"], ["Retrieve Blob Data"]] | |
| 22 | 16 | for repo in (self.gitrorepo, self.puregitrorepo): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -808,8 +808,6 @@ def test_git_file(self, rwrepo): | |||
| 808 | 808 | git_file_repo = Repo(rwrepo.working_tree_dir) | |
| 809 | 809 | self.assertEqual(osp.abspath(git_file_repo.git_dir), real_path_abs) | |
| 810 | 810 | ||
| 811 | - @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and PY3, | ||
| 812 | - "FIXME: smmp fails with: TypeError: Can't convert 'bytes' object to str implicitly") | ||
| 813 | 811 | def test_file_handle_leaks(self): | |
| 814 | 812 | def last_commit(repo, rev, path): | |
| 815 | 813 | commit = next(repo.iter_commits(rev, path, max_count=1)) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | 8 | import git | |
| 9 | 9 | from git.cmd import Git | |
| 10 | - from git.compat import string_types, is_win | ||
| 10 | + from git.compat import string_types | ||
| 11 | 11 | from git.exc import ( | |
| 12 | 12 | InvalidGitRepositoryError, | |
| 13 | 13 | RepositoryDirtyError | |
@@ -28,20 +28,6 @@ | |||
| 28 | 28 | import os.path as osp | |
| 29 | 29 | ||
| 30 | 30 | ||
| 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 | - | ||
| 45 | 31 | class TestRootProgress(RootUpdateProgress): | |
| 46 | 32 | ||
| 47 | 33 | """Just prints messages, for now without checking the correctness of the states""" | |
0 commit comments