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

Author: Byron

git/test/db/base.py

@@ -601,12 +601,12 @@ def test_rev_parse(self):
 		self.failUnlessRaises(NotImplementedError, rev_parse, "@{1 week ago}")
 
 	def test_submodules(self):
-		assert len(self.rorepo.submodules) == 1		# non-recursive
+		assert len(self.rorepo.submodules) == 2		# non-recursive
 		# in previous configurations, we had recursive repositories so this would compare to 2
-		# now there is only one left, as gitdb was merged
-		assert len(list(self.rorepo.iter_submodules())) == 1
+		# now there is only one left, as gitdb was merged, but we have smmap instead
+		assert len(list(self.rorepo.iter_submodules())) == 2
 
-		assert isinstance(self.rorepo.submodule("git/ext/async"), Submodule)
+		assert isinstance(self.rorepo.submodule("async"), Submodule)
 		self.failUnlessRaises(ValueError, self.rorepo.submodule, "doesn't exist")
 
 	@with_rw_repo('HEAD', bare=False)

git/test/objects/test_submodule.py

@@ -284,7 +284,9 @@ def _do_base_tests(self, rwrepo):
 
 			# make sure sub-submodule is not modified by forcing it to update
 			# to the revision it is supposed to point to.
-			csm.update()
+			for subitem in sm.traverse():
+				subitem.update()
+			#END checkout to right commit
 
 			# this would work
 			assert sm.remove(dry_run=True) is sm