Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't run fish_update_completions in unit tests

Browse source 
Running `fish_update_completions` in unit tests is not needed and
hideously expensive. To the point it can cause flakey test behavior.
This commit is contained in:
Kurtis Rader 2017-01-28 20:37:32 -08:00
parent 973097f025
commit 06282f02fd
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
share/functions/__fish_config_interactive.fish
View file

@ -110,9 +110,14 @@ function __fish_config_interactive -d "Initializations that should be performed
# Generate man page completions if not present.
#
if not test -d $userdatadir/fish/generated_completions
command -s python >/dev/null # feature needs python, don't try this on launch without it (#3588)
# fish_update_completions is a function, so it can not be directly run in background.
and eval (string escape "$__fish_bin_dir/fish") "-c 'fish_update_completions >/dev/null ^/dev/null' &"
# Generating completions from man pages needs python (see issue #3588).
# Don't do this if we're being invoked as part of running unit tests.
if command -qs python
and not set -q FISH_UNIT_TESTS_RUNNING
# We cannot simply do `fish_update_completions &` because it is a function. Hence the
# need for the convoluted `eval` to run it in a subshell.
eval (string escape "$__fish_bin_dir/fish") "-c 'fish_update_completions >/dev/null ^/dev/null' &"
end
end
#

4
tests/interactive.fish
View file

@ -7,6 +7,10 @@
# This is a list of flakey tests that often succeed when rerun.
set TESTS_TO_RETRY bind.expect
# Set this var to modify behavior of the code being tests. Such as avoiding running
# `fish_update_completions` when running tests.
set -x FISH_UNIT_TESTS_RUNNING 1
# Change to directory containing this script
cd (dirname (status -f))

4
tests/test.fish
View file

@ -4,6 +4,10 @@
# should be running it via `make test` to ensure the environment is properly
# setup.
# Set this var to modify behavior of the code being tests. Such as avoiding running
# `fish_update_completions` when running tests.
set -x FISH_UNIT_TESTS_RUNNING 1
# Change to directory containing this script
cd (dirname (status -f))