Skip to content

Commit 3528b9d

Browse files
authored
Merge pull request rails#51148 from yahonda/increase_timeout_for_assert_output_2
Increase assert_output timeout for `FullStackConsoleTest` and `ApplicationTests::ServerTest`
2 parents be0661c + 790c9c5 commit 3528b9d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

railties/test/application/console_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def teardown
121121
def write_prompt(command, expected_output = nil)
122122
@primary.puts command
123123
assert_output command, @primary
124-
assert_output expected_output, @primary if expected_output
124+
assert_output expected_output, @primary, 100 if expected_output
125125
assert_output "> ", @primary
126126
end
127127

railties/test/application/server_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ def teardown
2929

3030
Bundler.with_original_env do
3131
pid = Process.spawn("bin/rails server -b localhost -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica)
32-
assert_output("Listening", primary)
32+
assert_output("Listening", primary, 100)
3333

3434
rails("restart")
3535

36-
assert_output("Restarting", primary)
37-
assert_output("Listening", primary)
36+
assert_output("Restarting", primary, 100)
37+
assert_output("Listening", primary, 100)
3838
ensure
3939
kill(pid) if pid
4040
end
@@ -59,8 +59,8 @@ def teardown
5959

6060
Bundler.with_original_env do
6161
pid = Process.spawn("bin/rails server -b localhost", chdir: app_path, in: replica, out: primary, err: replica)
62-
assert_output("Hello world", primary)
63-
assert_output("Listening", primary)
62+
assert_output("Hello world", primary, 100)
63+
assert_output("Listening", primary, 100)
6464
ensure
6565
kill(pid) if pid
6666
end

0 commit comments

Comments
 (0)