summaryrefslogtreecommitdiff
path: root/spec/support/stub_configuration.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-09-21 14:55:08 +0100
committerNick Thomas <nick@gitlab.com>2017-09-22 10:05:28 +0100
commitba0ebbb510c4f19738b5e2ac2dee06193aafff3a (patch)
tree484e0108a315f296c5449928bf9399774debe753 /spec/support/stub_configuration.rb
parent26607a1690631916baf5a39d198ff7096cb5bde6 (diff)
downloadgitlab-ce-ba0ebbb510c4f19738b5e2ac2dee06193aafff3a.tar.gz
Allow the git circuit breaker to correctly handle missing repository storages
Diffstat (limited to 'spec/support/stub_configuration.rb')
-rw-r--r--spec/support/stub_configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb
index 45c10e78789..2dfb4d4a07f 100644
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
@@ -42,7 +42,7 @@ module StubConfiguration
# Default storage is always required
messages['default'] ||= Gitlab.config.repositories.storages.default
messages.each do |storage_name, storage_settings|
- storage_settings['path'] ||= TestEnv.repos_path
+ storage_settings['path'] = TestEnv.repos_path unless storage_settings.key?('path')
storage_settings['failure_count_threshold'] ||= 10
storage_settings['failure_wait_time'] ||= 30
storage_settings['failure_reset_time'] ||= 1800