Commitb56764b

committed

Fixed submodule related issues once again - is it ever going to end ?

1 parent8b3b222 commitb56764bCopy full SHA for b56764b

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -601,12 +601,12 @@ def test_rev_parse(self):`
`601`	`601`	`self.failUnlessRaises(NotImplementedError,rev_parse,"@{1 week ago}")`
`602`	`602`
`603`	`603`	`deftest_submodules(self):`
`604`		`-assertlen(self.rorepo.submodules)==1# non-recursive`
	`604`	`+assertlen(self.rorepo.submodules)==2# non-recursive`
`605`	`605`	`# in previous configurations, we had recursive repositories so this would compare to 2`
`606`		`-# now there is only one left, as gitdb was merged`
`607`		`-assertlen(list(self.rorepo.iter_submodules()))==1`
	`606`	`+# now there is only one left, as gitdb was merged, but we have smmap instead`
	`607`	`+assertlen(list(self.rorepo.iter_submodules()))==2`
`608`	`608`
`609`		`-assertisinstance(self.rorepo.submodule("git/ext/async"),Submodule)`
	`609`	`+assertisinstance(self.rorepo.submodule("async"),Submodule)`
`610`	`610`	`self.failUnlessRaises(ValueError,self.rorepo.submodule,"doesn't exist")`
`611`	`611`
`612`	`612`	`@with_rw_repo('HEAD',bare=False)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,9 @@ def _do_base_tests(self, rwrepo):`
`284`	`284`
`285`	`285`	`# make sure sub-submodule is not modified by forcing it to update`
`286`	`286`	`# to the revision it is supposed to point to.`
`287`		`-csm.update()`
	`287`	`+forsubiteminsm.traverse():`
	`288`	`+subitem.update()`
	`289`	`+#END checkout to right commit`
`288`	`290`
`289`	`291`	`# this would work`
`290`	`292`	`assertsm.remove(dry_run=True)issm`

Comments

(0)