Skip to content

Commit

Permalink
Bump up timeouts
Browse files Browse the repository at this point in the history
This should fix travis.

Also ensuring that we don't try to kill when pid is nil.
  • Loading branch information
jonleighton committed Mar 9, 2013
1 parent c614b76 commit 72be5bb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions railties/test/application/console_test.rb
Expand Up @@ -106,7 +106,7 @@ def teardown
teardown_app teardown_app
end end


def assert_output(expected, timeout = 0.2) def assert_output(expected, timeout = 5)
timeout = Time.now + timeout timeout = Time.now + timeout


output = "" output = ""
Expand Down Expand Up @@ -138,7 +138,7 @@ def spawn_console
in: @slave, out: @slave, err: @slave in: @slave, out: @slave, err: @slave
) )


assert_output "> ", 5 assert_output "> ", 30
pid pid
end end


Expand All @@ -157,6 +157,6 @@ def test_sandbox
write_prompt "Post.transaction { Post.create; raise }" write_prompt "Post.transaction { Post.create; raise }"
write_prompt "Post.count", "=> 0" write_prompt "Post.count", "=> 0"
ensure ensure
kill pid kill pid if pid
end end
end end

1 comment on commit 72be5bb

@carlosantoniodasilva
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

Please sign in to comment.