Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-23 12:06:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-23 12:06:03 +0300
commitb3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch)
tree5fda0011a7cc7de000186e465e61f893d478a1c8 /spec/uploaders
parent90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders')
-rw-r--r--spec/uploaders/workers/object_storage/background_move_worker_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb
index cf4872d6904..38b70d33993 100644
--- a/spec/uploaders/workers/object_storage/background_move_worker_spec.rb
+++ b/spec/uploaders/workers/object_storage/background_move_worker_spec.rb
@@ -22,7 +22,7 @@ describe ObjectStorage::BackgroundMoveWorker do
stub_lfs_object_storage(background_upload: true)
end
- it 'uploads object to storage' do
+ it 'uploads object to storage', :sidekiq_might_not_need_inline do
expect { perform }.to change { lfs_object.reload.file_store }.from(local).to(remote)
end
@@ -65,7 +65,7 @@ describe ObjectStorage::BackgroundMoveWorker do
stub_artifacts_object_storage(background_upload: true)
end
- it "migrates file to remote storage" do
+ it "migrates file to remote storage", :sidekiq_might_not_need_inline do
perform
expect(artifact.reload.file_store).to eq(remote)
@@ -91,7 +91,7 @@ describe ObjectStorage::BackgroundMoveWorker do
let(:subject_class) { project.class }
let(:subject_id) { project.id }
- it "migrates file to remote storage" do
+ it "migrates file to remote storage", :sidekiq_might_not_need_inline do
perform
project.reload
BatchLoader::Executor.clear_current
@@ -104,7 +104,7 @@ describe ObjectStorage::BackgroundMoveWorker do
let(:subject_class) { Upload }
let(:subject_id) { project.avatar.upload.id }
- it "migrates file to remote storage" do
+ it "migrates file to remote storage", :sidekiq_might_not_need_inline do
perform
expect(project.reload.avatar).not_to be_file_storage