summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2024-05-12 14:18:17 +1000
committerMaxime Coste <mawww@kakoune.org>2024-05-12 14:18:17 +1000
commit0e92b3fdefddbf81a008b3678faf4bf550be215c (patch)
tree16bf48c10455647b7241dd6dbfb6f046894f5849 /test
parent7be22f1ec28677ca0bb30316c6893ab4436734b1 (diff)
Fix another case where git tests were hanging
Diffstat (limited to 'test')
-rwxr-xr-xtest/run2
-rw-r--r--test/tools/git/blame-in-diff/script4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/run b/test/run
index e26aea05..a65f5396 100755
--- a/test/run
+++ b/test/run
@@ -193,7 +193,7 @@ ui_out() {
-until)
shift
while read -r event <&4; do
- [ "$event" == "$1" ] && break
+ [ "$event" = "$1" ] && break
done
;;
-until-grep)
diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script
index 6adda922..e22b3ec8 100644
--- a/test/tools/git/blame-in-diff/script
+++ b/test/tools/git/blame-in-diff/script
@@ -1,9 +1,9 @@
-ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
+ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
# We've jumped to the new version of line 2. Move to the old version so we
# can annotate the old file.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }'
-ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
+while ui_out -until-grep '"draw_status"' | grep '\[fifo\]'; do :; done > /dev/null
# We should have jumped to the old version of line 2, assert on kak_selection.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }'