summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-03 12:25:09 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-04 01:26:51 +0200
commitbe44602b633cfb49a472e192f235ba6de0055d38 (patch)
treef3bf2cf426e682aba1487174e7e38bd652b09a27 /git/test/test_submodule.py
parent86aa8738e0df54971e34f2e929484e0476c7f38a (diff)
downloadgitpython-be44602b633cfb49a472e192f235ba6de0055d38.tar.gz
hidden win-errs: Let leaking TCs run till end, then hide
+ Detect code breaking the body of TCs eventually hidden win-errors by raising SkipTest ALAP. + submodule.base.py: import classes from `git.objects` instead of `utils`. + had to ++ ulimit 100->110 for the extra code tested (more leaks :-) + Centralize is_win detection.
Diffstat (limited to 'git/test/test_submodule.py')
-rw-r--r--git/test/test_submodule.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 64460920..481783a6 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -418,10 +418,10 @@ class TestSubmodule(TestBase):
# Error if there is no submodule file here
self.failUnlessRaises(IOError, Submodule._config_parser, rwrepo, rwrepo.commit(self.k_no_subm_tag), True)
- @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and is_win,
- "FIXME: fails with: PermissionError: [WinError 32] The process cannot access the file because"
- "it is being used by another process: "
- "'C:\\Users\\ankostis\\AppData\\Local\\Temp\\tmp95c3z83bnon_bare_test_base_rw\\git\\ext\\gitdb\\gitdb\\ext\\smmap'") # noqa E501
+ # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
+ # "FIXME: fails with: PermissionError: [WinError 32] The process cannot access the file because"
+ # "it is being used by another process: "
+ # "'C:\\Users\\ankostis\\AppData\\Local\\Temp\\tmp95c3z83bnon_bare_test_base_rw\\git\\ext\\gitdb\\gitdb\\ext\\smmap'") # noqa E501
@with_rw_repo(k_subm_current)
def test_base_rw(self, rwrepo):
self._do_base_tests(rwrepo)
@@ -430,7 +430,7 @@ class TestSubmodule(TestBase):
def test_base_bare(self, rwrepo):
self._do_base_tests(rwrepo)
- @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and is_win and sys.version_info[:2] == (3, 5), """
+ @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and sys.version_info[:2] == (3, 5), """
File "C:\projects\gitpython\git\cmd.py", line 559, in execute
raise GitCommandNotFound(command, err)
git.exc.GitCommandNotFound: Cmd('git') not found due to: OSError('[WinError 6] The handle is invalid')
@@ -733,9 +733,9 @@ class TestSubmodule(TestBase):
assert commit_sm.binsha == sm_too.binsha
assert sm_too.binsha != sm.binsha
- @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and is_win,
- "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: "
- "'C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\test_work_tree_unsupportedryfa60di\\master_repo\\.git\\objects\\pack\\pack-bc9e0787aef9f69e1591ef38ea0a6f566ec66fe3.idx") # noqa E501
+ # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
+ # "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: "
+ # "'C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\test_work_tree_unsupportedryfa60di\\master_repo\\.git\\objects\\pack\\pack-bc9e0787aef9f69e1591ef38ea0a6f566ec66fe3.idx") # noqa E501
@with_rw_directory
def test_git_submodule_compatibility(self, rwdir):
parent = git.Repo.init(os.path.join(rwdir, 'parent'))