Permalink
Browse files

Bump up timeouts

This should fix travis.

Also ensuring that we don't try to kill when pid is nil.
  • Loading branch information...
1 parent c614b76 commit 72be5bb5573310e9b05f3f46b1e48b927a1f00d4 @jonleighton jonleighton committed Mar 9, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 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

1 comment on commit 72be5bb

😄

Please sign in to comment.