diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-10-24 11:22:32 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-10-26 10:54:20 +0200 |
| commit | 6f4c1fd5a5310e49b4471800a09eb150eacba60a (patch) | |
| tree | c6844274368c84a81038bd27c4c85c83b39c79a4 | |
| parent | 2a8c3f6d5c889e850ad18c796e5fb40f46fda4ca (diff) | |
| download | gitlab-ce-6f4c1fd5a5310e49b4471800a09eb150eacba60a.tar.gz | |
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.
| -rw-r--r-- | spec/support/helpers/test_env.rb | 5 |
1 files 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) |