Fixed submodule tests to go with either the old or the new version of gitdb

Byron · Byron · commit 4a8bdce7a665 · 2011-06-10T23:16:21.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
-[submodule "gitdb"]
-	path = git/ext/gitdb
-	url = git://github.com/gitpython-developers/gitdb.git
-	branch = master
+[submodule "gitdb"]
+	path = git/ext/gitdb
+	url = git://github.com/gitpython-developers/gitdb.git
diff --git a/git/ext/gitdb b/git/ext/gitdb
@@ -1 +1 @@
-Subproject commit 17d9d1395fb6d18d553e085150138463b5827a2f
+Subproject commit 422f29f7f3e53ff429b6ef4db55da0d28cb37af5
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -262,10 +262,11 @@ def _do_base_tests(self, rwrepo):
 			self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)
 			
 			# forcibly delete the child repository
+			prev_count = len(sm.children())
 			assert csm.remove(force=True) is csm
 			assert not csm.exists()
 			assert not csm.module_exists()
-			assert len(sm.children()) == 0
+			assert len(sm.children()) == prev_count - 1
 			# now we have a changed index, as configuration was altered.
 			# fix this
 			sm.module().index.reset(working_tree=True)
@@ -389,7 +390,7 @@ def test_root_module(self, rwrepo):
 		
 		# deep traversal gitdb / async
 		rsmsp = [sm.path for sm in rm.traverse()]
-		assert len(rsmsp) == 2			# gitdb and async, async being a child of gitdb
+		assert len(rsmsp) >= 2			# gitdb and async [and smmap], async being a child of gitdb
 		
 		# cannot set the parent commit as root module's path didn't exist
 		self.failUnlessRaises(ValueError, rm.set_parent_commit, 'HEAD')
@@ -538,13 +539,13 @@ def test_root_module(self, rwrepo):
 		# =================
 		# finally we recursively update a module, just to run the code at least once
 		# remove the module so that it has more work
-		assert len(nsm.children()) == 1
-		assert nsm.exists() and nsm.module_exists() and len(nsm.children()) == 1
+		assert len(nsm.children()) >= 1 # could include smmap
+		assert nsm.exists() and nsm.module_exists() and len(nsm.children()) >= 1
 		# assure we pull locally only
 		nsmc = nsm.children()[0] 
 		nsmc.config_writer().set_value('url', async_url)
 		rm.update(recursive=True, progress=prog, dry_run=True)		# just to run the code
 		rm.update(recursive=True, progress=prog)
 		
-		assert len(nsm.children()) == 1 and nsmc.module_exists()
+		assert len(nsm.children()) >= 2 and nsmc.module_exists()
 		
