diff options
Diffstat (limited to 'test/git')
| -rw-r--r-- | test/git/test_config.py | 4 | ||||
| -rw-r--r-- | test/git/test_submodule.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/git/test_config.py b/test/git/test_config.py index 604a25f4..8c846b99 100644 --- a/test/git/test_config.py +++ b/test/git/test_config.py @@ -14,9 +14,7 @@ class TestBase(TestCase): def _to_memcache(self, file_path): fp = open(file_path, "r") - sio = StringIO.StringIO() - sio.write(fp.read()) - sio.seek(0) + sio = StringIO.StringIO(fp.read()) sio.name = file_path return sio diff --git a/test/git/test_submodule.py b/test/git/test_submodule.py index 7922db77..7c8dffcb 100644 --- a/test/git/test_submodule.py +++ b/test/git/test_submodule.py @@ -19,7 +19,9 @@ class TestSubmodule(TestBase): # size is invalid self.failUnlessRaises(ValueError, getattr, sm, 'size') - # fails if tree has no gitmodule file + # set_parent_commit fails if tree has no gitmodule file + + if rwrepo.bare: # module fails @@ -28,6 +30,8 @@ class TestSubmodule(TestBase): # get the module repository pass # END bare handling + + # Writing of historical submodule configurations must not work @with_rw_repo(kCOTag) def test_base_rw(self, rwrepo): |