Fixed submodule tests to go with either the old or the new version of… · gitpython-developers/GitPython@4a8bdce · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests8 (8)
• Discussions
• Actions
• Security and quality42 (42)
• Insights

Commit 4a8bdce

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 8828ced commit 4a8bdce
Copy full SHA for 4a8bdce

3 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitmodules
• git
  • ext
    • gitdb
  • test
    • test_submodule.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitmodules‎

Copy file name to clipboard

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

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

Collapse file

‎git/ext/gitdb‎

Copy file name to clipboard

Submodule gitdb updated 9 files

• .gitmodules

  +3

  -1
• doc/source/changes.rst

  +5
• doc/source/conf.py

  +2

  -2
• gitdb/__init__.py

  +9

  -7
• gitdb/ext/smmap

  +1
• gitdb/pack.py

  +36

  -40
• gitdb/test/performance/test_pack.py

  +4

  -1
• gitdb/util.py

  +13
• setup.py

  +3

  -3

Collapse file

‎git/test/test_submodule.py‎

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

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

Original file line number	Diff line number	Diff line change
@@ -262,10 +262,11 @@ def _do_base_tests(self, rwrepo):
262	262	self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)
263	263
264	264	# forcibly delete the child repository
	265	+ prev_count = len(sm.children())
265	266	assert csm.remove(force=True) is csm
266	267	assert not csm.exists()
267	268	assert not csm.module_exists()
268		- assert len(sm.children()) == 0
	269	+ assert len(sm.children()) == prev_count - 1
269	270	# now we have a changed index, as configuration was altered.
270	271	# fix this
271	272	sm.module().index.reset(working_tree=True)
@@ -389,7 +390,7 @@ def test_root_module(self, rwrepo):
389	390
390	391	# deep traversal gitdb / async
391	392	rsmsp = [sm.path for sm in rm.traverse()]
392		- assert len(rsmsp) == 2 # gitdb and async, async being a child of gitdb
	393	+ assert len(rsmsp) >= 2 # gitdb and async [and smmap], async being a child of gitdb
393	394
394	395	# cannot set the parent commit as root module's path didn't exist
395	396	self.failUnlessRaises(ValueError, rm.set_parent_commit, 'HEAD')
@@ -538,13 +539,13 @@ def test_root_module(self, rwrepo):
538	539	# =================
539	540	# finally we recursively update a module, just to run the code at least once
540	541	# remove the module so that it has more work
541		- assert len(nsm.children()) == 1
542		- assert nsm.exists() and nsm.module_exists() and len(nsm.children()) == 1
	542	+ assert len(nsm.children()) >= 1 # could include smmap
	543	+ assert nsm.exists() and nsm.module_exists() and len(nsm.children()) >= 1
543	544	# assure we pull locally only
544	545	nsmc = nsm.children()[0]
545	546	nsmc.config_writer().set_value('url', async_url)
546	547	rm.update(recursive=True, progress=prog, dry_run=True) # just to run the code
547	548	rm.update(recursive=True, progress=prog)
548	549
549		- assert len(nsm.children()) == 1 and nsmc.module_exists()
	550	+ assert len(nsm.children()) >= 2 and nsmc.module_exists()
550	551

0 commit comments

Comments

0 (0)