Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/test/lib/helper.py b/test/lib/helper.py
 returnfunc(self,path,*args,**kwargs)
 exceptException:
 _logger.info(
 "Test %s.%s failed, output is at %r\n",
 "%s %s.%s failed, output is at %r\n",
 "Test"iffunc.__name__.startswith("test_")else"Helper",
 type(self).__name__,
 func.__name__,
 path,
diff --git a/test/test_tree.py b/test/test_tree.py
 # 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/

 fromioimportBytesIO

 fromgit.objectsimportTree,Blob
 fromtest.libimportTestBase

 importos
 importos.pathasosp
 frompathlibimportPath
 importsubprocess

 fromgit.objectsimportTree,Blob
 fromgit.utilimportcwd
 fromtest.libimportTestBase,with_rw_directory


 classTestTree(TestBase):
 deftest_serializable(self):
 testtree._deserialize(stream)
 # END for each item in tree

 deftest_tree_modifier_ordering(self):
 defsetup_git_repository_and_get_ordered_files():
 os.mkdir("tmp")
 os.chdir("tmp")
 @with_rw_directory
 def_get_git_ordered_files(self,rw_dir):
 """Get files as git orders them, to compare in test_tree_modifier_ordering."""
 # Create directory contents.
 Path(rw_dir,"file").mkdir()
 forfilenamein (
 "bin",
 "bin.d",
 "file.to",
 "file.toml",
 "file.toml.bin",
 "file0",
        ):
 Path(rw_dir,filename).touch()
 Path(rw_dir,"file","a").touch()

 withcwd(rw_dir):
 # Prepare the repository.
 subprocess.run(["git","init","-q"],check=True)
 os.mkdir("file")
 forfilenamein [
 "bin",
 "bin.d",
 "file.to",
 "file.toml",
 "file.toml.bin",
 "file0",
 "file/a",
            ]:
 open(filename,"a").close()

 subprocess.run(["git","add","."],check=True)
 subprocess.run(["git","commit","-m","c1"],check=True)
 tree_hash=subprocess.check_output(["git","rev-parse","HEAD^{tree}"]).decode().strip()
 cat_file_output=subprocess.check_output(["git","cat-file","-p",tree_hash]).decode()
 return [line.split()[-1]forlineincat_file_output.split("\n")ifline]

 # Get git output from which an ordered file list can be parsed.
 rev_parse_command= ["git","rev-parse","HEAD^{tree}"]
 tree_hash=subprocess.check_output(rev_parse_command).decode().strip()
 cat_file_command= ["git","cat-file","-p",tree_hash]
 cat_file_output=subprocess.check_output(cat_file_command).decode()

 return [line.split()[-1]forlineincat_file_output.split("\n")ifline]

 deftest_tree_modifier_ordering(self):
 """TreeModifier.set_done() sorts files in the same order git does."""
 git_file_names_in_order=self._get_git_ordered_files()

 hexsha="6c1faef799095f3990e9970bc2cb10aa0221cf9c"
 roottree=self.rorepo.tree(hexsha)
 here=file_names_in_order()
 return [eforeinaifeinhere]

 git_file_names_in_order=setup_git_repository_and_get_ordered_files()
 os.chdir("..")

 mod.set_done()
 assertnames_in_mod_cache()==git_file_names_in_order,"set_done() performs git-sorting"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,7 +97,8 @@ def wrapper(self, args, *kwargs):
		returnfunc(self,path,args,*kwargs)
		exceptException:
		_logger.info(
		"Test %s.%s failed, output is at %r\n",
		"%s %s.%s failed, output is at %r\n",
		"Test"iffunc.__name__.startswith("test_")else"Helper",
		type(self).__name__,
		func.__name__,
		path,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,14 +4,14 @@
		# 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/

		fromioimportBytesIO

		fromgit.objectsimportTree,Blob
		fromtest.libimportTestBase

		importos
		importos.pathasosp
		frompathlibimportPath
		importsubprocess

		fromgit.objectsimportTree,Blob
		fromgit.utilimportcwd
		fromtest.libimportTestBase,with_rw_directory


		classTestTree(TestBase):
		deftest_serializable(self):
Expand DownExpand Up		@@ -42,28 +42,39 @@ def test_serializable(self):
		testtree._deserialize(stream)
		# END for each item in tree

		deftest_tree_modifier_ordering(self):
		defsetup_git_repository_and_get_ordered_files():
		os.mkdir("tmp")
		os.chdir("tmp")
		@with_rw_directory
		def_get_git_ordered_files(self,rw_dir):
		"""Get files as git orders them, to compare in test_tree_modifier_ordering."""
		# Create directory contents.
		Path(rw_dir,"file").mkdir()
		forfilenamein (
		"bin",
		"bin.d",
		"file.to",
		"file.toml",
		"file.toml.bin",
		"file0",
		):
		Path(rw_dir,filename).touch()
		Path(rw_dir,"file","a").touch()

		withcwd(rw_dir):
		# Prepare the repository.
		subprocess.run(["git","init","-q"],check=True)
		os.mkdir("file")
		forfilenamein [
		"bin",
		"bin.d",
		"file.to",
		"file.toml",
		"file.toml.bin",
		"file0",
		"file/a",
		]:
		open(filename,"a").close()

		subprocess.run(["git","add","."],check=True)
		subprocess.run(["git","commit","-m","c1"],check=True)
		tree_hash=subprocess.check_output(["git","rev-parse","HEAD^{tree}"]).decode().strip()
		cat_file_output=subprocess.check_output(["git","cat-file","-p",tree_hash]).decode()
		return [line.split()[-1]forlineincat_file_output.split("\n")ifline]

		# Get git output from which an ordered file list can be parsed.
		rev_parse_command= ["git","rev-parse","HEAD^{tree}"]
		tree_hash=subprocess.check_output(rev_parse_command).decode().strip()
		cat_file_command= ["git","cat-file","-p",tree_hash]
		cat_file_output=subprocess.check_output(cat_file_command).decode()

		return [line.split()[-1]forlineincat_file_output.split("\n")ifline]

		deftest_tree_modifier_ordering(self):
		"""TreeModifier.set_done() sorts files in the same order git does."""
		git_file_names_in_order=self._get_git_ordered_files()

		hexsha="6c1faef799095f3990e9970bc2cb10aa0221cf9c"
		roottree=self.rorepo.tree(hexsha)
Expand DownExpand Up		@@ -92,9 +103,6 @@ def names_in_mod_cache():
		here=file_names_in_order()
		return [eforeinaifeinhere]

		git_file_names_in_order=setup_git_repository_and_get_ordered_files()
		os.chdir("..")

		mod.set_done()
		assertnames_in_mod_cache()==git_file_names_in_order,"set_done() performs git-sorting"

Expand Down