Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 1 deletions

diff --git a/spec/workers/authorized_project_update/project_recalculate_worker_spec.rb b/spec/workers/authorized_project_update/project_recalculate_worker_spec.rb
index 403793a15e2..a9a15565580 100644
--- a/spec/workers/authorized_project_update/project_recalculate_worker_spec.rb
+++ b/spec/workers/authorized_project_update/project_recalculate_worker_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe AuthorizedProjectUpdate::ProjectRecalculateWorker do
     end
 
     context 'exclusive lease' do
-      let(:lock_key) { "#{described_class.name.underscore}/#{project.root_namespace.id}" }
+      let(:lock_key) { "#{described_class.name.underscore}/projects/#{project.id}" }
       let(:timeout) { 10.seconds }
 
       context 'when exclusive lease has not been taken' do
diff --git a/spec/workers/packages/debian/generate_distribution_worker_spec.rb b/spec/workers/packages/debian/generate_distribution_worker_spec.rb
index a8751ccceae..a4627ec5d36 100644
--- a/spec/workers/packages/debian/generate_distribution_worker_spec.rb
+++ b/spec/workers/packages/debian/generate_distribution_worker_spec.rb
@@ -9,6 +9,9 @@ RSpec.describe Packages::Debian::GenerateDistributionWorker, type: :worker do
 
     subject { described_class.new.perform(container_type, distribution_id) }
 
+    let(:subject2) { described_class.new.perform(container_type, distribution_id) }
+    let(:subject3) { described_class.new.perform(container_type, distribution_id) }
+
     include_context 'with published Debian package'
 
     [:project, :group].each do |container_type|