diff options
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 60c2096a126..8e31c26591b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -27,6 +27,7 @@ module TestEnv 'expand-collapse-files' => '025db92', 'expand-collapse-lines' => '238e82d', 'video' => '8879059', + 'add-balsamiq-file' => 'b89b56d', 'crlf-diff' => '5938907', 'conflict-start' => '824be60', 'conflict-resolvable' => '1450cd6', @@ -38,7 +39,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 +127,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 |