summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-09 11:40:38 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-09 11:40:38 +0000
commit97b2c7c6333e2ec889874a670996bd0d0866bf51 (patch)
tree718c0d2f62673aefe99433d11298d9b8d29dd923
parent39493e45f1c70ba93cb8441123a45b59d277c574 (diff)
parent016522dd5fc115e6a96155cf6192ff27f52c304c (diff)
downloadgitlab-ce-97b2c7c6333e2ec889874a670996bd0d0866bf51.tar.gz
Merge branch 'bvl-port-storage-spec-helpers-from-ee' into 'master'
Add a helper to stub storage settings with defaults See merge request !13419
-rw-r--r--spec/support/stub_configuration.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb
index 516f8878679..37c89d37aa0 100644
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
@@ -38,6 +38,17 @@ module StubConfiguration
allow(Gitlab.config.backup).to receive_messages(to_settings(messages))
end
+ def stub_storage_settings(messages)
+ messages.each do |storage_name, storage_settings|
+ storage_settings['failure_count_threshold'] ||= 10
+ storage_settings['failure_wait_time'] ||= 30
+ storage_settings['failure_reset_time'] ||= 1800
+ storage_settings['storage_timeout'] ||= 5
+ end
+
+ allow(Gitlab.config.repositories).to receive(:storages).and_return(messages)
+ end
+
private
# Modifies stubbed messages to also stub possible predicate versions