◐ Shell
reader mode source ↗
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
3 changes: 2 additions & 1 deletion test/lib/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ def wrapper(self, *args, **kwargs):
return func(self, path, *args, **kwargs)
except Exception:
_logger.info(
"Test %s.%s failed, output is at %r\n",
type(self).__name__,
func.__name__,
path,
Expand Down
62 changes: 35 additions & 27 deletions test/test_tree.py
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/

from io import BytesIO

from git.objects import Tree, Blob
from test.lib import TestBase

import os
import os.path as osp
import subprocess


class TestTree(TestBase):
def test_serializable(self):
Expand Down @@ -42,28 +42,39 @@ def test_serializable(self):
testtree._deserialize(stream)
# END for each item in tree

def test_tree_modifier_ordering(self):
def setup_git_repository_and_get_ordered_files():
os.mkdir("tmp")
os.chdir("tmp")
subprocess.run(["git", "init", "-q"], check=True)
os.mkdir("file")
for filename in [
"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] for line in cat_file_output.split("\n") if line]

hexsha = "6c1faef799095f3990e9970bc2cb10aa0221cf9c"
roottree = self.rorepo.tree(hexsha)
Expand Down Expand Up @@ -92,9 +103,6 @@ def names_in_mod_cache():
here = file_names_in_order()
return [e for e in a if e in here]

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

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

Expand Down
Toggle all file notes Toggle all file annotations