mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2024-12-23 11:29:01 +00:00
Fix flaky test cases
This commit is contained in:
parent
898d8d94c8
commit
4accc69022
@ -1253,24 +1253,29 @@ module TestShell
|
|||||||
tmux.send_keys 'cat ', 'C-t', pane: 0
|
tmux.send_keys 'cat ', 'C-t', pane: 0
|
||||||
tmux.until(1) { |lines| lines.item_count >= 1 }
|
tmux.until(1) { |lines| lines.item_count >= 1 }
|
||||||
tmux.send_keys 'fzf-unicode', pane: 1
|
tmux.send_keys 'fzf-unicode', pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 2/' }
|
redraw = ->() { tmux.send_keys 'C-l', pane: 1 }
|
||||||
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *2/) }
|
||||||
|
|
||||||
tmux.send_keys '1', pane: 1
|
tmux.send_keys '1', pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 1/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *1/) }
|
||||||
tmux.send_keys :BTab, pane: 1
|
tmux.send_keys :BTab, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].include? '(1)' }
|
tmux.until(1) { |lines| redraw.(); lines[-2].include? '(1)' }
|
||||||
|
|
||||||
tmux.send_keys :BSpace, pane: 1
|
tmux.send_keys :BSpace, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 2/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *2/) }
|
||||||
|
|
||||||
tmux.send_keys '2', pane: 1
|
tmux.send_keys '2', pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 1/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *1/) }
|
||||||
tmux.send_keys :BTab, pane: 1
|
tmux.send_keys :BTab, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].include? '(2)' }
|
tmux.until(1) { |lines| redraw.(); lines[-2].include? '(2)' }
|
||||||
|
|
||||||
tmux.send_keys :Enter, pane: 1
|
tmux.send_keys :Enter, pane: 1
|
||||||
tmux.until { |lines| lines[-1].include?('cat') || lines[-2].include?('cat') }
|
tmux.until do |lines|
|
||||||
tmux.until { |lines| lines[-1].include?('fzf-unicode') || lines[-2].include?('fzf-unicode') }
|
tmux.send_keys 'C-l'
|
||||||
|
[-1, -2].map { |offset| lines[offset] }.any? do |line|
|
||||||
|
line.start_with?('cat') && line.include?('fzf-unicode')
|
||||||
|
end
|
||||||
|
end
|
||||||
tmux.send_keys :Enter
|
tmux.send_keys :Enter
|
||||||
tmux.until { |lines| lines[-1].include? 'test1test2' }
|
tmux.until { |lines| lines[-1].include? 'test1test2' }
|
||||||
end
|
end
|
||||||
@ -1481,23 +1486,27 @@ module CompletionTest
|
|||||||
tmux.paste 'cd /tmp/fzf-test; echo -n test3 > "fzf-unicode 테스트1"; echo -n test4 > "fzf-unicode 테스트2"'
|
tmux.paste 'cd /tmp/fzf-test; echo -n test3 > "fzf-unicode 테스트1"; echo -n test4 > "fzf-unicode 테스트2"'
|
||||||
tmux.prepare
|
tmux.prepare
|
||||||
tmux.send_keys 'cat fzf-unicode**', :Tab, pane: 0
|
tmux.send_keys 'cat fzf-unicode**', :Tab, pane: 0
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 2/' }
|
redraw = ->() { tmux.send_keys 'C-l', pane: 1 }
|
||||||
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *2/) }
|
||||||
|
|
||||||
tmux.send_keys '1', pane: 1
|
tmux.send_keys '1', pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 1/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *1/) }
|
||||||
tmux.send_keys :BTab, pane: 1
|
tmux.send_keys :BTab, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].include? '(1)' }
|
tmux.until(1) { |lines| redraw.(); lines[-2].include? '(1)' }
|
||||||
|
|
||||||
tmux.send_keys :BSpace, pane: 1
|
tmux.send_keys :BSpace, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 2/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *2/) }
|
||||||
|
|
||||||
tmux.send_keys '2', pane: 1
|
tmux.send_keys '2', pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].start_with? ' 1/' }
|
tmux.until(1) { |lines| redraw.(); lines[-2] =~ %r(^ *1/) }
|
||||||
tmux.send_keys :BTab, pane: 1
|
tmux.send_keys :BTab, pane: 1
|
||||||
tmux.until(1) { |lines| lines[-2].include? '(2)' }
|
tmux.until(1) { |lines| redraw.(); lines[-2].include? '(2)' }
|
||||||
|
|
||||||
tmux.send_keys :Enter, pane: 1
|
tmux.send_keys :Enter, pane: 1
|
||||||
tmux.until { |lines| lines[-1].include?('cat') || lines[-2].include?('cat') }
|
tmux.until do |lines|
|
||||||
|
tmux.send_keys 'C-l'
|
||||||
|
lines[-1].include?('cat') || lines[-2].include?('cat')
|
||||||
|
end
|
||||||
tmux.send_keys :Enter
|
tmux.send_keys :Enter
|
||||||
tmux.until { |lines| lines[-1].include? 'test3test4' }
|
tmux.until { |lines| lines[-1].include? 'test3test4' }
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user