Allow to use same periods for housekeeping tasks

This enables skipping a lesser housekeeping task
(incremental or full repack) by consistently
scheduling a higher task (respectively full repack or gc)
with the same period.
Cf. #34981

1 files changed, 18 insertions, 4 deletions

diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index c7a9eabdf06..78cacf9ff5d 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -167,19 +167,33 @@ describe ApplicationSetting do
     context 'housekeeping settings' do
       it { is_expected.not_to allow_value(0).for(:housekeeping_incremental_repack_period) }
 
-      it 'wants the full repack period to be longer than the incremental repack period' do
+      it 'wants the full repack period to be at least the incremental repack period' do
         subject.housekeeping_incremental_repack_period = 2
         subject.housekeeping_full_repack_period = 1
 
         expect(subject).not_to be_valid
       end
 
-      it 'wants the gc period to be longer than the full repack period' do
-        subject.housekeeping_full_repack_period = 2
-        subject.housekeeping_gc_period = 1
+      it 'wants the gc period to be at least the full repack period' do
+        subject.housekeeping_full_repack_period = 100
+        subject.housekeeping_gc_period = 90
 
         expect(subject).not_to be_valid
       end
+
+      it 'allows the same period for incremental repack and full repack, effectively skipping incremental repack' do
+        subject.housekeeping_incremental_repack_period = 2
+        subject.housekeeping_full_repack_period = 2
+
+        expect(subject).to be_valid
+      end
+
+      it 'allows the same period for full repack and gc, effectively skipping full repack' do
+        subject.housekeeping_full_repack_period = 100
+        subject.housekeeping_gc_period = 100
+
+        expect(subject).to be_valid
+      end
     end
   end