diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 13:20:45 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 13:20:45 +0300 |
commit | bb9d360c0a7daed6aa08a0635e084c314c2c8b3e (patch) | |
tree | 2320d72d11cf226ff35ccc5f00c9e4cd8af5fee1 /spec/tasks/gitlab/backup_rake_spec.rb | |
parent | 963e445f58f1cbe03f821167a3bf1d0b8cc8a56d (diff) | |
parent | 008a6a6ce6fa943adcfecf3a606b845cfa282680 (diff) |
Merge branch 'mark-legacy-git-access' into 'master'
Route path lookups through legacy_disk_path
See merge request gitlab-org/gitlab-ce!17743
Diffstat (limited to 'spec/tasks/gitlab/backup_rake_spec.rb')
-rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 168facd51a6..0d24782f317 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -195,14 +195,23 @@ describe 'gitlab:app namespace rake task' do end context 'multiple repository storages' do - let(:gitaly_address) { Gitlab.config.repositories.storages.default.gitaly_address } + let(:storage_default) do + Gitlab::GitalyClient::StorageSettings.new(@default_storage_hash.merge('path' => 'tmp/tests/default_storage')) + end + let(:test_second_storage) do + Gitlab::GitalyClient::StorageSettings.new(@default_storage_hash.merge('path' => 'tmp/tests/custom_storage')) + end let(:storages) do { - 'default' => { 'path' => Settings.absolute('tmp/tests/default_storage'), 'gitaly_address' => gitaly_address }, - 'test_second_storage' => { 'path' => Settings.absolute('tmp/tests/custom_storage'), 'gitaly_address' => gitaly_address } + 'default' => storage_default, + 'test_second_storage' => test_second_storage } end + before(:all) do + @default_storage_hash = Gitlab.config.repositories.storages.default.to_h + end + before do # We only need a backup of the repositories for this test stub_env('SKIP', 'db,uploads,builds,artifacts,lfs,registry') |