diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
| commit | 3cd08f4bf96cda3e9d3abf233095107832b17c20 (patch) | |
| tree | dc09a618783a79d70f2a404374d4b850ccf9cc84 /spec/support/helpers | |
| parent | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 0320f966c37..613535b6da5 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -84,6 +84,7 @@ module TestEnv TMP_TEST_PATH = Rails.root.join('tmp', 'tests', '**') REPOS_STORAGE = 'default'.freeze + SECOND_STORAGE_PATH = Rails.root.join('tmp', 'tests', 'second_storage') # Test environment # @@ -141,6 +142,7 @@ module TestEnv end FileUtils.mkdir_p(repos_path) + FileUtils.mkdir_p(SECOND_STORAGE_PATH) FileUtils.mkdir_p(backup_path) FileUtils.mkdir_p(pages_path) FileUtils.mkdir_p(artifacts_path) @@ -176,8 +178,6 @@ 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 unless system(spawn_script) |