提交 72be5bb5 编写于 作者: J Jon Leighton

Bump up timeouts

This should fix travis.

Also ensuring that we don't try to kill when pid is nil.
上级 c614b764
...@@ -106,7 +106,7 @@ def teardown ...@@ -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 = ""
...@@ -138,7 +138,7 @@ def spawn_console ...@@ -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
...@@ -157,6 +157,6 @@ def test_sandbox ...@@ -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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册