do not make assumptions about first log line in integration test (might be a warning)
This commit is contained in:
parent
752faa3073
commit
9d50905236
|
@ -45,11 +45,6 @@ module IntegrationHelper
|
||||||
at_exit { kill }
|
at_exit { kill }
|
||||||
end
|
end
|
||||||
|
|
||||||
def expect(str)
|
|
||||||
return if log.size < str.size or log[0, str.size] == str
|
|
||||||
raise "Server did not start properly:\n\n#{log}"
|
|
||||||
end
|
|
||||||
|
|
||||||
def ping(timeout = 30)
|
def ping(timeout = 30)
|
||||||
loop do
|
loop do
|
||||||
return if alive?
|
return if alive?
|
||||||
|
@ -57,7 +52,6 @@ module IntegrationHelper
|
||||||
$stderr.puts command, log
|
$stderr.puts command, log
|
||||||
fail "timeout"
|
fail "timeout"
|
||||||
else
|
else
|
||||||
expect "loading"
|
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue