Commitebe8f64

committed

Added test for the recursive code path.

1 parent3f2d76b commitebe8f64Copy full SHA for ebe8f64

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ def update(self, previous_commit=None, recursive=True, force_remove=False, init=`
`1121`	`1121`	`# or defective depth. The RootSubmodule type will never process itself,`
`1122`	`1122`	`# which was done in the previous expression`
`1123`	`1123`	`ifrecursive:`
`1124`		`-type(cls)(sm.module()).update(recursive=True,force_remove=force_remove,`
	`1124`	`+type(self)(sm.module()).update(recursive=True,force_remove=force_remove,`
`1125`	`1125`	`init=init,to_latest_revision=to_latest_revision)`
`1126`	`1126`	`#END handle recursive`
`1127`	`1127`	`# END for each submodule to update`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,8 @@ def test_root_module(self, rwrepo):`
`394`	`394`	`#================`
`395`	`395`	`nsmn="newsubmodule"`
`396`	`396`	`nsmp="submrepo"`
`397`		`-nsm=Submodule.add(rwrepo,nsmn,nsmp,url=join_path_native(self.rorepo.working_tree_dir,rsms[0].path,rsms[1].path))`
	`397`	`+async_url=join_path_native(self.rorepo.working_tree_dir,rsms[0].path,rsms[1].path)`
	`398`	`+nsm=Submodule.add(rwrepo,nsmn,nsmp,url=async_url)`
`398`	`399`	`csmadded=rwrepo.index.commit("Added submodule")`
`399`	`400`	`nsm.set_parent_commit(csmadded)`
`400`	`401`	`assertnsm.module_exists()`
`@@ -466,8 +467,16 @@ def test_root_module(self, rwrepo):`
`466`	`467`	`assertnsmmh.ref.tracking_branch()isnotNone`
`467`	`468`	`assertnotnsmmh.is_detached`
`468`	`469`
`469`		`-`
`470`	`470`	`# recursive update`
`471`	`471`	`# =================`
`472`	`472`	`# finally we recursively update a module, just to run the code at least once`
	`473`	`+# remove the module so that it has more work`
	`474`	`+assertlen(nsm.children())==1`
	`475`	`+assertnsm.exists()andnsm.module_exists()andlen(nsm.children())==1`
	`476`	`+# assure we pull locally only`
	`477`	`+nsmc=nsm.children()[0]`
	`478`	`+nsmc.config_writer().set_value('url',async_url)`
	`479`	`+rm.update(recursive=True)`
	`480`	`+`
	`481`	`+assertlen(nsm.children())==1andnsmc.module_exists()`
`473`	`482`

Comments

(0)