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
path: root/spec/lib
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2019-03-13 17:54:30 +0300
committerGabriel Mazetto <brodock@gmail.com>2019-03-17 02:27:38 +0300
commit523712d116a560f314cf144edbde076d7ab6fdc4 (patch)
tree393881835a092d127226e4f958929f218b5717b4 /spec/lib
parent7d985db1404acf866e7c689fc88eb935970c90c9 (diff)
Fix storage migration check for non-empty queues
The previous code works fine when running specs, but the API does not exist outside that environment.
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/hashed_storage/migrator_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/hashed_storage/migrator_spec.rb b/spec/lib/gitlab/hashed_storage/migrator_spec.rb
index d03a74ac9eb..8e253b51597 100644
--- a/spec/lib/gitlab/hashed_storage/migrator_spec.rb
+++ b/spec/lib/gitlab/hashed_storage/migrator_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe Gitlab::HashedStorage::Migrator, :sidekiq do
+describe Gitlab::HashedStorage::Migrator, :sidekiq, :redis do
describe '#bulk_schedule_migration' do
it 'schedules job to HashedStorage::MigratorWorker' do
Sidekiq::Testing.fake! do
@@ -189,7 +189,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq do
set(:project) { create(:project, :empty_repo) }
it 'returns true when there are MigratorWorker jobs scheduled' do
- Sidekiq::Testing.fake! do
+ Sidekiq::Testing.disable! do
::HashedStorage::MigratorWorker.perform_async(1, 5)
expect(subject.migration_pending?).to be_truthy
@@ -197,7 +197,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq do
end
it 'returns true when there are ProjectMigrateWorker jobs scheduled' do
- Sidekiq::Testing.fake! do
+ Sidekiq::Testing.disable! do
::HashedStorage::ProjectMigrateWorker.perform_async(1)
expect(subject.migration_pending?).to be_truthy
@@ -213,7 +213,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq do
set(:project) { create(:project, :empty_repo) }
it 'returns true when there are RollbackerWorker jobs scheduled' do
- Sidekiq::Testing.fake! do
+ Sidekiq::Testing.disable! do
::HashedStorage::RollbackerWorker.perform_async(1, 5)
expect(subject.rollback_pending?).to be_truthy
@@ -221,7 +221,7 @@ describe Gitlab::HashedStorage::Migrator, :sidekiq do
end
it 'returns true when there are jobs scheduled' do
- Sidekiq::Testing.fake! do
+ Sidekiq::Testing.disable! do
::HashedStorage::ProjectRollbackWorker.perform_async(1)
expect(subject.rollback_pending?).to be_truthy