Commit 54fbb857 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

RSpec setup: proper waiting for HGitaly

We couldn't do it right at the time HGitaly appeared because
it wasn't Unix Domain socket capable (and it didn't look to
be critical, given the setup startup times of other components,
hence we did not make the effort to adapt the `wait` method to
TCP sockets).

Nowadays, doing it is a minimal effort, so here we are.

--HG--
branch : heptapod
parent a1c02763614b
Pipeline #26339 canceled with stages
in 10 minutes and 34 seconds
......@@ -233,6 +233,7 @@ def start_hgitaly
# SIGTERM, HGitaly is supposed to clean up, reap workers etc.
Kernel.at_exit { terminate(pid) }
wait('hgitaly')
puts " HGitaly started in #{Time.now - start} seconds"
end
......@@ -303,7 +304,8 @@ def gitaly_url
end
def socket_path(service)
TMP_TEST_PATH.join('gitaly', "#{service}.socket").to_s
category = service == 'hgitaly' ? 'hgitaly' : 'gitaly'
TMP_TEST_PATH.join(category, "#{service}.socket").to_s
end
def praefect_socket_path
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment