From 1687283c13caf7ff8d1959591541dff6a171ca1e Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 17 Nov 2010 22:38:10 +0100 Subject: RootModule.update: initial implementation of update method, which should be able to handle submodule removals, additions, path changes and branch changes. All this still needs to be tested though --- test/git/test_submodule.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/git/test_submodule.py') diff --git a/test/git/test_submodule.py b/test/git/test_submodule.py index 212b1e1d..8430f4bc 100644 --- a/test/git/test_submodule.py +++ b/test/git/test_submodule.py @@ -202,7 +202,7 @@ class TestSubmodule(TestBase): sm.module().index.reset(working_tree=True) # this would work - sm.remove(dry_run=True) + assert sm.remove(dry_run=True) is sm assert sm.module_exists() sm.remove(force=True, dry_run=True) assert sm.module_exists() @@ -213,7 +213,7 @@ class TestSubmodule(TestBase): self.failUnlessRaises(InvalidGitRepositoryError, sm.remove) # forcibly delete the child repository - csm.remove(force=True) + assert csm.remove(force=True) is csm assert not csm.exists() assert not csm.module_exists() assert len(sm.children()) == 0 @@ -263,8 +263,8 @@ class TestSubmodule(TestBase): # needs update as the head changed, it thinks its in the history # of the repo otherwise - nsm._parent_commit = rwrepo.head.commit - osm._parent_commit = rwrepo.head.commit + nsm.set_parent_commit(rwrepo.head.commit) + osm.set_parent_commit(rwrepo.head.commit) # MOVE MODULE ############# -- cgit v1.2.3