Skip to content

Commit e462fa2

Browse files
authored
Fix test_rendering flaky pager test (#1152)
1 parent b29cc2c commit e462fa2

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

test/irb/yamatanooroti/test_rendering.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,8 @@ def test_pager_page_content_doesnt_page_output_when_it_fits_in_the_screen
399399
LINES
400400
start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
401401
write("IRB::Pager.page_content('a' * (80 * 7))\n")
402-
write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
403-
404402
assert_screen(/a{80}/)
403+
write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
405404
# because pager is not invoked, foobar will be evaluated
406405
assert_screen(/foobar/)
407406
close
@@ -413,9 +412,11 @@ def test_long_evaluation_output_is_paged
413412
LINES
414413
start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
415414
write("'a' * 80 * 11\n")
416-
write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
417-
418415
assert_screen(/"a{79}\n(a{80}\n){7}/)
416+
417+
write("'foo' + 'bar'\n")
418+
write("q\n") # quit pager
419+
assert_screen(/irb\(main\):002>/) # make sure IRB resumes
419420
# because pager is invoked, foobar will not be evaluated
420421
assert_screen(/\A(?!foobar)/)
421422
close
@@ -443,6 +444,7 @@ def test_long_evaluation_output_is_preserved_after_paging
443444
LINES
444445
start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
445446
write("'a' * 80 * 11\n")
447+
assert_screen(/(a{80}\n){6}/) # wait for pager to show up
446448
write("q") # quit pager
447449
write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
448450

0 commit comments

Comments
 (0)