summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-10-24 10:43:31 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-10-24 11:15:21 +0200
commit3efaf5b56d7942b431c570b2176bceb8c400bd58 (patch)
tree04de0650cc7e3f7883c2f88edd39ee11acdd464e
parent5522f0f4e5fcc54735c6588d17c935f9bc74c2f3 (diff)
downloadgitlab-ce-3efaf5b56d7942b431c570b2176bceb8c400bd58.tar.gz
Hotfix for Rspec and second storage
Rails requires a second storage for testing cross shard features. Gitaly will not boot if this second storage doesn't exist. So this will create this storage without adding it to the list of storages that Rails knows about.
-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)