mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-11 20:48:49 +00:00
Create a temp dir per test
The main weirdness here is that `with tempfile.TemporaryDirectory() as foo` will have foo as a string, not foo.name???
This commit is contained in:
Fabian Boehm
parent
5507bcc425
commit
dc63404c96
1 changed files with 149 additions and 139 deletions
|
|
@ -22,6 +22,75 @@ BLUE = "\033[34m"
|
||||||
RED = "\033[31m"
|
RED = "\033[31m"
|
||||||
|
|
||||||
|
|
||||||
|
def makeenv(script_path, home, oldcwd):
|
||||||
|
xdg_config = home + "/xdg_config_home"
|
||||||
|
func_dir = xdg_config + "/fish/functions"
|
||||||
|
os.makedirs(func_dir)
|
||||||
|
os.makedirs(xdg_config + "/fish/conf.d/")
|
||||||
|
for func in (script_path / "test_functions").glob("*.fish"):
|
||||||
|
shutil.copy(func, func_dir + "/" + func.parts[-1])
|
||||||
|
shutil.copy(
|
||||||
|
script_path / "interactive.config", xdg_config + "/fish/conf.d/interactive.fish"
|
||||||
|
)
|
||||||
|
|
||||||
|
xdg_data = home + "/xdg_data_home"
|
||||||
|
os.makedirs(xdg_data)
|
||||||
|
xdg_runtime = home + "/xdg_runtime_home"
|
||||||
|
os.makedirs(xdg_runtime)
|
||||||
|
xdg_cache = home + "/xdg_cache_home"
|
||||||
|
os.makedirs(xdg_cache)
|
||||||
|
tmp = home + "/temp"
|
||||||
|
os.makedirs(tmp)
|
||||||
|
|
||||||
|
# Compile fish_test_helper if necessary.
|
||||||
|
# If we're run multiple times, keep this around to save time.
|
||||||
|
# TODO: It's cheesy to leave this in the current dir
|
||||||
|
if not os.path.exists(oldcwd / "fish_test_helper"):
|
||||||
|
comp = subprocess.run(
|
||||||
|
[
|
||||||
|
"cc",
|
||||||
|
script_path / "fish_test_helper.c",
|
||||||
|
"-o",
|
||||||
|
oldcwd / "fish_test_helper",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
shutil.copy(oldcwd / "fish_test_helper", home + "/fish_test_helper")
|
||||||
|
|
||||||
|
# unset LANG, TERM, ...
|
||||||
|
for var in [
|
||||||
|
"XDG_DATA_DIRS",
|
||||||
|
"LANGUAGE",
|
||||||
|
"COLORTERM",
|
||||||
|
"KONSOLE_PROFILE_NAME",
|
||||||
|
"KONSOLE_VERSION",
|
||||||
|
"TERM_PROGRAM",
|
||||||
|
"TERM_PROGRAM_VERSION",
|
||||||
|
"VTE_VERSION",
|
||||||
|
]:
|
||||||
|
if var in os.environ:
|
||||||
|
del os.environ[var]
|
||||||
|
langvars = [key for key in os.environ.keys() if key.startswith("LC_")]
|
||||||
|
for key in langvars:
|
||||||
|
del os.environ[key]
|
||||||
|
|
||||||
|
os.environ.update(
|
||||||
|
{
|
||||||
|
"HOME": home,
|
||||||
|
"TMPDIR": tmp,
|
||||||
|
"FISH_FAST_FAIL": "1",
|
||||||
|
"FISH_UNIT_TESTS_RUNNING": "1",
|
||||||
|
"XDG_CONFIG_HOME": xdg_config,
|
||||||
|
"XDG_DATA_HOME": xdg_data,
|
||||||
|
"XDG_RUNTIME_DIR": xdg_runtime,
|
||||||
|
"XDG_CACHE_HOME": xdg_cache,
|
||||||
|
"fish_test_helper": home + "/fish_test_helper",
|
||||||
|
"TERM": "xterm",
|
||||||
|
"LANG": "C",
|
||||||
|
"LC_CTYPE": "en_US.UTF-8",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
if len(sys.argv) < 2:
|
if len(sys.argv) < 2:
|
||||||
print("Usage: test_driver.py FISH_DIRECTORY TESTS")
|
print("Usage: test_driver.py FISH_DIRECTORY TESTS")
|
||||||
|
|
@ -31,6 +100,7 @@ def main():
|
||||||
if not fishdir.is_dir():
|
if not fishdir.is_dir():
|
||||||
fishdir = fishdir.parent
|
fishdir = fishdir.parent
|
||||||
script_path = Path(__file__).parent
|
script_path = Path(__file__).parent
|
||||||
|
oldcwd = Path(os.getcwd())
|
||||||
|
|
||||||
failcount = 0
|
failcount = 0
|
||||||
passcount = 0
|
passcount = 0
|
||||||
|
|
@ -59,151 +129,91 @@ def main():
|
||||||
for path in sorted(script_path.glob("pexpects/*.py"))
|
for path in sorted(script_path.glob("pexpects/*.py"))
|
||||||
]
|
]
|
||||||
|
|
||||||
# Set up tempdir
|
|
||||||
# "delete=" was added in 3.12.
|
|
||||||
home = tempfile.TemporaryDirectory(prefix="fishtest-")
|
|
||||||
xdg_config = home.name + "/xdg_config_home"
|
|
||||||
func_dir = xdg_config + "/fish/functions"
|
|
||||||
os.makedirs(func_dir)
|
|
||||||
os.makedirs(xdg_config + "/fish/conf.d/")
|
|
||||||
for func in (script_path / "test_functions").glob("*.fish"):
|
|
||||||
shutil.copy(func, func_dir + "/" + func.parts[-1])
|
|
||||||
shutil.copy(
|
|
||||||
script_path / "interactive.config", xdg_config + "/fish/conf.d/interactive.fish"
|
|
||||||
)
|
|
||||||
|
|
||||||
xdg_data = home.name + "/xdg_data_home"
|
|
||||||
os.makedirs(xdg_data)
|
|
||||||
xdg_runtime = home.name + "/xdg_runtime_home"
|
|
||||||
os.makedirs(xdg_runtime)
|
|
||||||
xdg_cache = home.name + "/xdg_cache_home"
|
|
||||||
os.makedirs(xdg_cache)
|
|
||||||
tmp = home.name + "/temp"
|
|
||||||
os.makedirs(tmp)
|
|
||||||
|
|
||||||
# Compile fish_test_helper if necessary.
|
|
||||||
# If we're run multiple times, keep this around to save time.
|
|
||||||
# TODO: It's cheesy to leave this in the current dir
|
|
||||||
if not os.path.exists("fish_test_helper"):
|
|
||||||
comp = subprocess.run(
|
|
||||||
["cc", script_path / "fish_test_helper.c", "-o", "fish_test_helper"]
|
|
||||||
)
|
|
||||||
shutil.copy("fish_test_helper", home.name + "/fish_test_helper")
|
|
||||||
def_subs.update({"fish_test_helper": home.name + "/fish_test_helper"})
|
|
||||||
|
|
||||||
# unset LANG, TERM, ...
|
|
||||||
for var in [
|
|
||||||
"XDG_DATA_DIRS",
|
|
||||||
"LANGUAGE",
|
|
||||||
"COLORTERM",
|
|
||||||
"KONSOLE_PROFILE_NAME",
|
|
||||||
"KONSOLE_VERSION",
|
|
||||||
"TERM_PROGRAM",
|
|
||||||
"TERM_PROGRAM_VERSION",
|
|
||||||
"VTE_VERSION",
|
|
||||||
]:
|
|
||||||
if var in os.environ:
|
|
||||||
del os.environ[var]
|
|
||||||
langvars = [key for key in os.environ.keys() if key.startswith("LC_")]
|
|
||||||
for key in langvars:
|
|
||||||
del os.environ[key]
|
|
||||||
|
|
||||||
os.environ.update(
|
|
||||||
{
|
|
||||||
"HOME": home.name,
|
|
||||||
"TMPDIR": tmp,
|
|
||||||
"FISH_FAST_FAIL": "1",
|
|
||||||
"FISH_UNIT_TESTS_RUNNING": "1",
|
|
||||||
"XDG_CONFIG_HOME": xdg_config,
|
|
||||||
"XDG_DATA_HOME": xdg_data,
|
|
||||||
"XDG_RUNTIME_DIR": xdg_runtime,
|
|
||||||
"XDG_CACHE_HOME": xdg_cache,
|
|
||||||
"fish_test_helper": home.name + "/fish_test_helper",
|
|
||||||
"TERM": "xterm",
|
|
||||||
"LANG": "C",
|
|
||||||
"LC_CTYPE": "en_US.UTF-8",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# environ for py files has a few changes.
|
|
||||||
pyenviron = os.environ.copy()
|
|
||||||
pyenviron.update(
|
|
||||||
{
|
|
||||||
"PYTHONPATH": str(script_path),
|
|
||||||
"fish": str(fishdir / "fish"),
|
|
||||||
"fish_key_reader": str(fishdir / "fish_key_reader"),
|
|
||||||
"fish_indent": str(fishdir / "fish_indent"),
|
|
||||||
"TERM": "dumb",
|
|
||||||
"FISH_FORCE_COLOR": "1" if sys.stdout.isatty() else "0",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
os.chdir(home.name)
|
|
||||||
|
|
||||||
print(f"Checking files (TMPDIR is {home.name})")
|
|
||||||
if not PEXPECT and any(x.endswith(".py") for (x, _) in files):
|
if not PEXPECT and any(x.endswith(".py") for (x, _) in files):
|
||||||
print(f"{RED}Skipping pexpect tests because pexpect is not installed{RESET}")
|
print(f"{RED}Skipping pexpect tests because pexpect is not installed{RESET}")
|
||||||
|
|
||||||
for f, arg in files:
|
for f, arg in files:
|
||||||
starttime = datetime.now()
|
if not f.endswith(".fish") and not f.endswith(".py"):
|
||||||
if f.endswith(".fish"):
|
|
||||||
subs = def_subs.copy()
|
|
||||||
subs["s"] = f
|
|
||||||
# littlecheck
|
|
||||||
print(f"{arg}..", end="", flush=True)
|
|
||||||
ret = littlecheck.check_path(f, subs, lconfig, lambda x: print(x.message()))
|
|
||||||
endtime = datetime.now()
|
|
||||||
duration_ms = round((endtime - starttime).total_seconds() * 1000)
|
|
||||||
if ret is littlecheck.SKIP:
|
|
||||||
print(f"{BLUE}SKIPPED{RESET}")
|
|
||||||
skipcount += 1
|
|
||||||
elif ret:
|
|
||||||
print(f"{GREEN}PASS{RESET} ({duration_ms} ms)")
|
|
||||||
passcount += 1
|
|
||||||
else:
|
|
||||||
print(f"{RED}FAIL{RESET} ({duration_ms} ms)")
|
|
||||||
failcount += 1
|
|
||||||
elif f.endswith(".py"):
|
|
||||||
print(f"{arg}..", end="", flush=True)
|
|
||||||
if not PEXPECT:
|
|
||||||
print(f"{BLUE}SKIPPED{RESET}")
|
|
||||||
skipcount += 1
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
proc = subprocess.run(
|
|
||||||
["python3", f],
|
|
||||||
capture_output=True,
|
|
||||||
env=pyenviron,
|
|
||||||
# Timeout of 90 seconds, about 9 times what any of these takes
|
|
||||||
timeout=90,
|
|
||||||
)
|
|
||||||
except subprocess.TimeoutExpired as e:
|
|
||||||
print(f"{RED}FAILED due to timeout{RESET}")
|
|
||||||
if e.output:
|
|
||||||
print(e.output.decode("utf-8"))
|
|
||||||
if e.stderr:
|
|
||||||
print(e.stderr.decode("utf-8"))
|
|
||||||
failcount += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
endtime = datetime.now()
|
|
||||||
duration_ms = round((endtime - starttime).total_seconds() * 1000)
|
|
||||||
if proc.returncode == 0:
|
|
||||||
print(f"{GREEN}PASS{RESET} ({duration_ms} ms)")
|
|
||||||
passcount += 1
|
|
||||||
elif proc.returncode == 127:
|
|
||||||
print(f"{BLUE}SKIPPED{RESET}")
|
|
||||||
skipcount += 1
|
|
||||||
else:
|
|
||||||
print(f"{RED}FAILED{RESET} ({duration_ms} ms)")
|
|
||||||
if proc.stdout:
|
|
||||||
print(proc.stdout.decode("utf-8"))
|
|
||||||
if proc.stderr:
|
|
||||||
print(proc.stderr.decode("utf-8"))
|
|
||||||
failcount += 1
|
|
||||||
else:
|
|
||||||
print(f"Not a valid test file: {arg}")
|
print(f"Not a valid test file: {arg}")
|
||||||
failcount += 1
|
failcount += 1
|
||||||
|
continue
|
||||||
|
|
||||||
|
starttime = datetime.now()
|
||||||
|
with tempfile.TemporaryDirectory(prefix="fishtest-") as home:
|
||||||
|
makeenv(script_path, home, oldcwd)
|
||||||
|
os.chdir(home)
|
||||||
|
if f.endswith(".fish"):
|
||||||
|
subs = def_subs.copy()
|
||||||
|
subs.update({"s": f, "fish_test_helper": home + "/fish_test_helper"})
|
||||||
|
|
||||||
|
# littlecheck
|
||||||
|
print(f"{arg}..", end="", flush=True)
|
||||||
|
ret = littlecheck.check_path(
|
||||||
|
f, subs, lconfig, lambda x: print(x.message())
|
||||||
|
)
|
||||||
|
endtime = datetime.now()
|
||||||
|
duration_ms = round((endtime - starttime).total_seconds() * 1000)
|
||||||
|
if ret is littlecheck.SKIP:
|
||||||
|
print(f"{BLUE}SKIPPED{RESET}")
|
||||||
|
skipcount += 1
|
||||||
|
elif ret:
|
||||||
|
print(f"{GREEN}PASS{RESET} ({duration_ms} ms)")
|
||||||
|
passcount += 1
|
||||||
|
else:
|
||||||
|
print(f"{RED}FAIL{RESET} ({duration_ms} ms)")
|
||||||
|
failcount += 1
|
||||||
|
print(f"Tmpdir is {home}")
|
||||||
|
elif f.endswith(".py"):
|
||||||
|
# environ for py files has a few changes.
|
||||||
|
pyenviron = os.environ.copy()
|
||||||
|
pyenviron.update(
|
||||||
|
{
|
||||||
|
"PYTHONPATH": str(script_path),
|
||||||
|
"fish": str(fishdir / "fish"),
|
||||||
|
"fish_key_reader": str(fishdir / "fish_key_reader"),
|
||||||
|
"fish_indent": str(fishdir / "fish_indent"),
|
||||||
|
"TERM": "dumb",
|
||||||
|
"FISH_FORCE_COLOR": "1" if sys.stdout.isatty() else "0",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
print(f"{arg}..", end="", flush=True)
|
||||||
|
if not PEXPECT:
|
||||||
|
print(f"{BLUE}SKIPPED{RESET}")
|
||||||
|
skipcount += 1
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
proc = subprocess.run(
|
||||||
|
["python3", f],
|
||||||
|
capture_output=True,
|
||||||
|
env=pyenviron,
|
||||||
|
# Timeout of 90 seconds, about 9 times what any of these takes
|
||||||
|
timeout=90,
|
||||||
|
)
|
||||||
|
except subprocess.TimeoutExpired as e:
|
||||||
|
print(f"{RED}FAILED due to timeout{RESET}")
|
||||||
|
if e.output:
|
||||||
|
print(e.output.decode("utf-8"))
|
||||||
|
if e.stderr:
|
||||||
|
print(e.stderr.decode("utf-8"))
|
||||||
|
failcount += 1
|
||||||
|
continue
|
||||||
|
|
||||||
|
endtime = datetime.now()
|
||||||
|
duration_ms = round((endtime - starttime).total_seconds() * 1000)
|
||||||
|
if proc.returncode == 0:
|
||||||
|
print(f"{GREEN}PASS{RESET} ({duration_ms} ms)")
|
||||||
|
passcount += 1
|
||||||
|
elif proc.returncode == 127:
|
||||||
|
print(f"{BLUE}SKIPPED{RESET}")
|
||||||
|
skipcount += 1
|
||||||
|
else:
|
||||||
|
print(f"{RED}FAILED{RESET} ({duration_ms} ms)")
|
||||||
|
if proc.stdout:
|
||||||
|
print(proc.stdout.decode("utf-8"))
|
||||||
|
if proc.stderr:
|
||||||
|
print(proc.stderr.decode("utf-8"))
|
||||||
|
failcount += 1
|
||||||
|
print(f"Tmpdir is {home}")
|
||||||
if passcount + failcount + skipcount > 1:
|
if passcount + failcount + skipcount > 1:
|
||||||
print(f"{passcount} / {passcount + failcount} passed ({skipcount} skipped)")
|
print(f"{passcount} / {passcount + failcount} passed ({skipcount} skipped)")
|
||||||
if passcount == 0 and failcount == 0 and skipcount:
|
if passcount == 0 and failcount == 0 and skipcount:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue