From 72be5bb5573310e9b05f3f46b1e48b927a1f00d4 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sat, 9 Mar 2013 17:48:48 +0000 Subject: [PATCH] Bump up timeouts This should fix travis. Also ensuring that we don't try to kill when pid is nil. --- railties/test/application/console_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb index 592bd73924..f4450c8a3c 100644 --- a/railties/test/application/console_test.rb +++ b/railties/test/application/console_test.rb @@ -106,7 +106,7 @@ def teardown teardown_app end - def assert_output(expected, timeout = 0.2) + def assert_output(expected, timeout = 5) timeout = Time.now + timeout output = "" @@ -138,7 +138,7 @@ def spawn_console in: @slave, out: @slave, err: @slave ) - assert_output "> ", 5 + assert_output "> ", 30 pid end @@ -157,6 +157,6 @@ def test_sandbox write_prompt "Post.transaction { Post.create; raise }" write_prompt "Post.count", "=> 0" ensure - kill pid + kill pid if pid end end -- GitLab