Fixed submodule tests to go with either the old or the new version of… · drapichrust/GitPython@7076f43 · GitHub

1. drapichrust
2. GitPython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 7076f43

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

committed

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

1 parent 095013f commit 7076f43
Copy full SHA for 7076f43

2 files changed

+9-8Lines changed: 9 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitmodules
• git/test/objects
  • test_submodule.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitmodules‎

Copy file name to clipboard

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -1,3 +1,3 @@
1		- [submodule "git/ext/async"]
2		- path = git/ext/async
3		- url = git://github.com/gitpython-developers/async.git
	1	+ [submodule "gitdb"]
	2	+ path = git/ext/gitdb
	3	+ url = git://github.com/gitpython-developers/gitdb.git

Collapse file

‎git/test/objects/test_submodule.py‎

Copy file name to clipboardExpand all lines: git/test/objects/test_submodule.py

+6-5Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -284,10 +284,11 @@ def _do_base_tests(self, rwrepo):
284	284	self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)
285	285
286	286	# forcibly delete the child repository
	287	+ prev_count = len(sm.children())
287	288	assert csm.remove(force=True) is csm
288	289	assert not csm.exists()
289	290	assert not csm.module_exists()
290		- assert len(sm.children()) == 0
	291	+ assert len(sm.children()) == prev_count - 1
291	292	# now we have a changed index, as configuration was altered.
292	293	# fix this
293	294	sm.module().index.reset(working_tree=True)
@@ -411,7 +412,7 @@ def test_root_module(self, rwrepo):
411	412
412	413	# deep traversal git / async
413	414	rsmsp = [sm.path for sm in rm.traverse()]
414		- assert len(rsmsp) == 1 # git and async, async being a child of git
	415	+ assert len(rsmsp) == 2 # git, async, smmap, async being a child of git.
415	416
416	417	# cannot set the parent commit as root module's path didn't exist
417	418	self.failUnlessRaises(ValueError, rm.set_parent_commit, 'HEAD')
@@ -564,13 +565,13 @@ def test_root_module(self, rwrepo):
564	565	# =================
565	566	# finally we recursively update a module, just to run the code at least once
566	567	# remove the module so that it has more work
567		- assert len(nsm.children()) == 1
568		- assert nsm.exists() and nsm.module_exists() and len(nsm.children()) == 1
	568	+ assert len(nsm.children()) >= 1 # could include smmap
	569	+ assert nsm.exists() and nsm.module_exists() and len(nsm.children()) >= 1
569	570	# assure we pull locally only
570	571	nsmc = nsm.children()[0]
571	572	nsmc.config_writer().set_value('url', async_url)
572	573	rm.update(recursive=True, progress=prog, dry_run=True) # just to run the code
573	574	rm.update(recursive=True, progress=prog)
574	575
575		- assert len(nsm.children()) == 1 and nsmc.module_exists()
	576	+ assert len(nsm.children()) >= 2 and nsmc.module_exists()
576	577

0 commit comments

Comments

0 (0)