diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-13 09:45:34 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-13 09:45:34 +0000 |
commit | a66af9b121d3f03f46a689cb9bb0867628618974 (patch) | |
tree | d0538dd5c1b3b29365df7662c4e673a7e2afe405 /spec/support/shared_examples/uploaders/object_storage_shared_examples.rb | |
parent | 82c638d9f65db5d1beb6869aaeea01c43cac22d8 (diff) | |
parent | 3961407248c55f0524c8acfa154ace4ed33e087a (diff) | |
download | gitlab-ce-a66af9b121d3f03f46a689cb9bb0867628618974.tar.gz |
Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders' into 'master'
Resolve "Upload migration lease key is incorrect for non-mounted uploaders"
Closes #47513
See merge request gitlab-org/gitlab-ce!19600
Diffstat (limited to 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb')
-rw-r--r-- | spec/support/shared_examples/uploaders/object_storage_shared_examples.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb b/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb index 1ecddc14d58..19800c6638f 100644 --- a/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb +++ b/spec/support/shared_examples/uploaders/object_storage_shared_examples.rb @@ -76,10 +76,8 @@ shared_examples "migrates" do |to_store:, from_store: nil| end context 'when migrate! is occupied by another process' do - let(:exclusive_lease_key) { "object_storage_migrate:#{subject.model.class}:#{subject.model.id}" } - before do - @uuid = Gitlab::ExclusiveLease.new(exclusive_lease_key, timeout: 1.hour.to_i).try_obtain + @uuid = Gitlab::ExclusiveLease.new(subject.exclusive_lease_key, timeout: 1.hour.to_i).try_obtain end it 'does not execute migrate!' do @@ -95,7 +93,7 @@ shared_examples "migrates" do |to_store:, from_store: nil| end after do - Gitlab::ExclusiveLease.cancel(exclusive_lease_key, @uuid) + Gitlab::ExclusiveLease.cancel(subject.exclusive_lease_key, @uuid) end end |