diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-01 20:42:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 20:42:27 +0200 |
| commit | 9d6b417ea3a4507ea78714f0cb7add75b13032d5 (patch) | |
| tree | 77365cb808a255eb53889725bfce775b5090330e /git/test/test_submodule.py | |
| parent | 4592785004ad1a4869d650dc35a1e9099245dad9 (diff) | |
| parent | 9a521681ff8614beb8e2c566cf3c475baca22169 (diff) | |
| download | gitpython-9d6b417ea3a4507ea78714f0cb7add75b13032d5.tar.gz | |
Merge pull request #519 from ankostis/appveyor
Test project on Windows with MINGW/Cygwin git (conda2.7&3.4/cpy-3.5)
Diffstat (limited to 'git/test/test_submodule.py')
| -rw-r--r-- | git/test/test_submodule.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py index 17ce605a..8e2829b2 100644 --- a/git/test/test_submodule.py +++ b/git/test/test_submodule.py @@ -9,7 +9,7 @@ from git.test.lib import ( TestBase, with_rw_repo ) -from gitdb.test.lib import with_rw_directory +from git.test.lib import with_rw_directory from git.exc import ( InvalidGitRepositoryError, RepositoryDirtyError @@ -17,7 +17,7 @@ from git.exc import ( from git.objects.submodule.base import Submodule from git.objects.submodule.root import RootModule, RootUpdateProgress from git.util import to_native_path_linux, join_path_native -from git.compat import string_types +from git.compat import string_types, is_win from git.repo.fun import ( find_git_dir, touch @@ -26,7 +26,7 @@ from git.repo.fun import ( # 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 sys.platform == 'win32': +if is_win: try: import smmap.util smmap.util.MapRegion._test_read_into_memory = True @@ -49,6 +49,10 @@ prog = TestRootProgress() class TestSubmodule(TestBase): + def tearDown(self): + import gc + gc.collect() + k_subm_current = "c15a6e1923a14bc760851913858a3942a4193cdb" k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3" k_no_subm_tag = "0.1.6" @@ -305,7 +309,8 @@ class TestSubmodule(TestBase): # but ... we have untracked files in the child submodule fn = join_path_native(csm.module().working_tree_dir, "newfile") - open(fn, 'w').write("hi") + with open(fn, 'w') as fd: + fd.write("hi") self.failUnlessRaises(InvalidGitRepositoryError, sm.remove) # forcibly delete the child repository |