Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly (#24607)
This commit is contained in:
		@@ -9,11 +9,13 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
 | 
			
		||||
  let!(:account2)  { Fabricate(:account, domain: nil) }
 | 
			
		||||
  let!(:account3)  { Fabricate(:account, domain: nil) }
 | 
			
		||||
  let!(:account4)  { Fabricate(:account, domain: nil) }
 | 
			
		||||
  let!(:account5)  { Fabricate(:account, domain: nil) }
 | 
			
		||||
  let!(:remote)    { Fabricate(:account) }
 | 
			
		||||
 | 
			
		||||
  let!(:policy1)   { Fabricate(:account_statuses_cleanup_policy, account: account1) }
 | 
			
		||||
  let!(:policy2)   { Fabricate(:account_statuses_cleanup_policy, account: account3) }
 | 
			
		||||
  let!(:policy3)   { Fabricate(:account_statuses_cleanup_policy, account: account4, enabled: false) }
 | 
			
		||||
  let!(:policy4)   { Fabricate(:account_statuses_cleanup_policy, account: account5) }
 | 
			
		||||
 | 
			
		||||
  let(:queue_size)       { 0 }
 | 
			
		||||
  let(:queue_latency)    { 0 }
 | 
			
		||||
@@ -42,6 +44,7 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
 | 
			
		||||
      Fabricate(:status, account: account2, created_at: 3.years.ago)
 | 
			
		||||
      Fabricate(:status, account: account3, created_at: 3.years.ago)
 | 
			
		||||
      Fabricate(:status, account: account4, created_at: 3.years.ago)
 | 
			
		||||
      Fabricate(:status, account: account5, created_at: 3.years.ago)
 | 
			
		||||
      Fabricate(:status, account: remote, created_at: 3.years.ago)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@@ -111,8 +114,21 @@ describe Scheduler::AccountsStatusesCleanupScheduler do
 | 
			
		||||
        expect { subject.perform }.to_not change { account4.statuses.count }
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'eventually deletes every deletable toot' do
 | 
			
		||||
        expect { subject.perform; subject.perform; subject.perform; subject.perform }.to change { Status.count }.by(-20)
 | 
			
		||||
      it 'eventually deletes every deletable toot given enough runs' do
 | 
			
		||||
        stub_const 'Scheduler::AccountsStatusesCleanupScheduler::MAX_BUDGET', 4
 | 
			
		||||
 | 
			
		||||
        expect { 10.times { subject.perform } }.to change { Status.count }.by(-30)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'correctly round-trips between users across several runs' do
 | 
			
		||||
        stub_const 'Scheduler::AccountsStatusesCleanupScheduler::MAX_BUDGET', 3
 | 
			
		||||
        stub_const 'Scheduler::AccountsStatusesCleanupScheduler::PER_ACCOUNT_BUDGET', 2
 | 
			
		||||
 | 
			
		||||
        expect { 3.times { subject.perform } }
 | 
			
		||||
          .to change { Status.count }.by(-3 * 3)
 | 
			
		||||
          .and change { account1.statuses.count }
 | 
			
		||||
          .and change { account3.statuses.count }
 | 
			
		||||
          .and change { account5.statuses.count }
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user