summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-10-24 09:51:14 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-10-24 09:51:14 +0000
commit379b4d8a96dbdb3f9f7d16002f76218800b17ae2 (patch)
tree07bd1d7c4c5be4a50540d03dd5fb8468142285f7
parent3d77a9fb73d295a9edf1dcb3cc7835a6c858f486 (diff)
parent3efaf5b56d7942b431c570b2176bceb8c400bd58 (diff)
downloadgitlab-ce-379b4d8a96dbdb3f9f7d16002f76218800b17ae2.tar.gz
Merge branch 'zj-hotpatch-rspec' into 'master'
Hotfix for Rspec and second storage See merge request gitlab-org/gitlab-ce!22558
-rw-r--r--spec/support/helpers/test_env.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 71287f28171..71d72ff27e9 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -168,6 +168,8 @@ module TestEnv
return
end
+ FileUtils.mkdir_p("tmp/tests/second_storage") unless File.exist?("tmp/tests/second_storage")
+
spawn_script = Rails.root.join('scripts/gitaly-test-spawn').to_s
Bundler.with_original_env do
raise "gitaly spawn failed" unless system(spawn_script)