diff options
author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-11-30 12:58:51 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-11-30 12:58:51 +0000 |
commit | a14bd24a023220507f8f77e7a0962ca259fb9605 (patch) | |
tree | 4d77ee8b718316b4f8278d29b1ac3d7edbf2a8f9 | |
parent | feece7713247a063bfa71ab701f8a164e6fa71bb (diff) | |
download | gitlab-ce-a14bd24a023220507f8f77e7a0962ca259fb9605.tar.gz |
Set an artificial $HOME for gitaly in test
-rwxr-xr-x | scripts/gitaly-test-spawn | 3 | ||||
-rw-r--r-- | spec/spec_helper.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index dd603eec7f6..8e05eca8d7e 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -1,7 +1,8 @@ #!/usr/bin/env ruby gitaly_dir = 'tmp/tests/gitaly' +env = { 'HOME' => File.expand_path('tmp/tests') } args = %W[#{gitaly_dir}/gitaly #{gitaly_dir}/config.toml] # Print the PID of the spawned process -puts spawn(*args, [:out, :err] => 'log/gitaly-test.log') +puts spawn(env, *args, [:out, :err] => 'log/gitaly-test.log') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6310ea1b52b..242a2230b67 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -207,3 +207,6 @@ Shoulda::Matchers.configure do |config| with.library :rails end end + +# Prevent Rugged from picking up local developer gitconfig. +Rugged::Settings['search_path_global'] = Rails.root.join('tmp/tests').to_s |