Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 44 deletions

diff --git a/spec/workers/project_export_worker_spec.rb b/spec/workers/project_export_worker_spec.rb
index 9923d8bde7f..dd0a921059d 100644
--- a/spec/workers/project_export_worker_spec.rb
+++ b/spec/workers/project_export_worker_spec.rb
@@ -4,4 +4,30 @@ require 'spec_helper'
 
 RSpec.describe ProjectExportWorker do
   it_behaves_like 'export worker'
+
+  context 'exporters duration measuring' do
+    let(:user) { create(:user) }
+    let(:project) { create(:project) }
+    let(:worker) { described_class.new }
+
+    subject { worker.perform(user.id, project.id) }
+
+    before do
+      project.add_owner(user)
+    end
+
+    it 'logs exporters execution duration' do
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:version_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:avatar_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:tree_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:uploads_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:repo_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:wiki_repo_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:lfs_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:snippets_repo_saver_duration_s, anything)
+      expect(worker).to receive(:log_extra_metadata_on_done).with(:design_repo_saver_duration_s, anything)
+
+      subject
+    end
+  end
 end
diff --git a/spec/workers/quality/test_data_cleanup_worker_spec.rb b/spec/workers/quality/test_data_cleanup_worker_spec.rb
deleted file mode 100644
index a17e6e0cb1a..00000000000
--- a/spec/workers/quality/test_data_cleanup_worker_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Quality::TestDataCleanupWorker do
-  subject { described_class.new }
-
-  shared_examples 'successful deletion' do
-    before do
-      allow(Gitlab).to receive(:staging?).and_return(true)
-    end
-
-    it 'removes test groups' do
-      expect { subject.perform }.to change(Group, :count).by(-test_group_count)
-    end
-  end
-
-  describe "#perform" do
-    context 'with multiple test groups to remove' do
-      let(:test_group_count) { 5 }
-      let!(:groups_to_remove) { create_list(:group, test_group_count, :test_group) }
-      let!(:group_to_keep) { create(:group, path: 'test-group-fulfillment-keep', created_at: 1.day.ago) }
-      let!(:non_test_group) { create(:group) }
-      let(:non_test_owner_group) { create(:group, path: 'test-group-fulfillment1234', created_at: 4.days.ago) }
-
-      before do
-        non_test_owner_group.add_owner(create(:user))
-      end
-
-      it_behaves_like 'successful deletion'
-    end
-
-    context 'with paid groups' do
-      let(:test_group_count) { 1 }
-      let!(:paid_group) { create(:group, :test_group) }
-
-      before do
-        allow(paid_group).to receive(:paid?).and_return(true)
-      end
-
-      it_behaves_like 'successful deletion'
-    end
-  end
-end