Commit df43dc0a authored by Toon Claes's avatar Toon Claes

Explicitly test if every project id is being synced

parent d3bf53e3
...@@ -92,22 +92,28 @@ describe Geo::RepositorySyncWorker do ...@@ -92,22 +92,28 @@ describe Geo::RepositorySyncWorker do
end end
context 'all repositories fail' do context 'all repositories fail' do
let!(:project_list) { create_list(:project, 4, :random_last_repository_updated_at) }
before do before do
allow_any_instance_of(described_class).to receive(:db_retrieve_batch_size).and_return(2) # Must be >1 because of the Geo::BaseSchedulerWorker#interleave allow_any_instance_of(described_class).to receive(:db_retrieve_batch_size).and_return(2) # Must be >1 because of the Geo::BaseSchedulerWorker#interleave
allow_any_instance_of(described_class).to receive(:max_capacity).and_return(3) # Must be more than db_retrieve_batch_size allow_any_instance_of(described_class).to receive(:max_capacity).and_return(3) # Must be more than db_retrieve_batch_size
allow_any_instance_of(Project).to receive(:ensure_repository).and_raise(Gitlab::Shell::Error.new('foo')) allow_any_instance_of(Project).to receive(:ensure_repository).and_raise(Gitlab::Shell::Error.new('foo'))
allow_any_instance_of(Geo::ProjectSyncWorker).to receive(:sync_wiki?).and_return(false) allow_any_instance_of(Geo::ProjectSyncWorker).to receive(:sync_wiki?).and_return(false)
allow_any_instance_of(Geo::RepositorySyncService).to receive(:expire_repository_caches) allow_any_instance_of(Geo::RepositorySyncService).to receive(:expire_repository_caches)
create_list(:project, 4, :random_last_repository_updated_at)
end end
it 'does not retry the same projects over and over again' do it 'tries to sync every project' do
Sidekiq::Testing.inline! { subject.perform } project_list.each do |project|
expect(Geo::ProjectSyncWorker)
.to receive(:perform_in)
.with(anything, project.id, anything)
.at_least(:once)
.and_call_original
end
expect do 3.times do
Sidekiq::Testing.inline! { subject.perform } Sidekiq::Testing.inline! { subject.perform }
end.to change { Geo::ProjectRegistry.count } end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment