diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 21:20:41 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 21:20:41 +0300 |
| commit | bbfbcebdf69261bac6aa142f430719955e8e86b9 (patch) | |
| tree | 25916a1a761cb6c8fcdac4b20b76017a7f4506d3 /spec/support/test_env.rb | |
| parent | 3b82444eb7791e58e3e0ba2f08b8ccde48e3d4c6 (diff) | |
| parent | 920d55b9f8afd35e16351fb57d671acf66092e89 (diff) | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 60c2096a126..0b3c6169c9b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -38,7 +38,9 @@ module TestEnv 'deleted-image-test' => '6c17798', 'wip' => 'b9238ee', 'csv' => '3dd0896', - 'v1.1.0' => 'b83d6e3' + 'v1.1.0' => 'b83d6e3', + 'add-ipython-files' => '6d85bb69', + 'add-pdf-file' => 'e774ebd3' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily @@ -124,12 +126,13 @@ module TestEnv raise "Can't clone gitaly" end - start_gitaly(gitaly_dir, socket_path) + start_gitaly(gitaly_dir) end - def start_gitaly(gitaly_dir, socket_path) + def start_gitaly(gitaly_dir) gitaly_exec = File.join(gitaly_dir, 'gitaly') - @gitaly_pid = spawn({ "GITALY_SOCKET_PATH" => socket_path }, gitaly_exec, [:out, :err] => '/dev/null') + gitaly_config = File.join(gitaly_dir, 'config.toml') + @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null') end def stop_gitaly |