From 6f4c1fd5a5310e49b4471800a09eb150eacba60a Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Wed, 24 Oct 2018 11:22:32 +0200 Subject: Regenerate Gitaly's config.toml each rspec run This behaviour I removed in 08cdf65b9e1f, but this reverts this specific line. In case storages, or other options changes which are set by the Rails environment, this will easier to migrate to. Storage paths is kept in plural, to support multiple storage in later release for just testing purposes. But its probable that multi Gitaly scenarios need to be tested. --- spec/support/helpers/test_env.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 71d72ff27e9..293538d759d 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -158,8 +158,9 @@ module TestEnv version: Gitlab::GitalyClient.expected_server_version, task: "gitlab:gitaly:install[#{gitaly_dir},#{repos_path}]") do - start_gitaly(gitaly_dir) - end + Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, { 'default' => repos_path }, force: true) + start_gitaly(gitaly_dir) + end end def start_gitaly(gitaly_dir) -- cgit v1.2.1