test/jobs/housekeeping_job_test.rb in rocketjob-3.2.1 vs test/jobs/housekeeping_job_test.rb in rocketjob-3.3.0

@@ -9,51 +9,81 @@
 
   describe RocketJob::Jobs::HousekeepingJob do
     before do
       HousekeepingJobTest::TestJob.delete_all
       RocketJob::Jobs::HousekeepingJob.delete_all
+      RocketJob::Server.delete_all
+    end
 
-      job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-      job.abort!
-      job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
-      job.abort!
+    describe 'job retention' do
+      before do
+        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
+        job.abort!
+        job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
+        job.abort!
 
-      job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-      job.perform_now
-      job.save!
-      job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
-      job.perform_now
-      job.save!
+        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
+        job.perform_now
+        job.save!
+        job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
+        job.perform_now
+        job.save!
 
-      job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-      job.fail!
-      job = HousekeepingJobTest::TestJob.new(created_at: 15.days.ago)
-      job.fail!
+        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
+        job.fail!
+        job = HousekeepingJobTest::TestJob.new(created_at: 15.days.ago)
+        job.fail!
 
-      job = HousekeepingJobTest::TestJob.new(created_at: 400.days.ago)
-      job.pause!
-      job = HousekeepingJobTest::TestJob.new
-      job.pause!
+        job = HousekeepingJobTest::TestJob.new(created_at: 400.days.ago)
+        job.pause!
+        job = HousekeepingJobTest::TestJob.new
+        job.pause!
 
-      HousekeepingJobTest::TestJob.create!(created_at: 15.days.ago)
-      HousekeepingJobTest::TestJob.create!
+        HousekeepingJobTest::TestJob.create!(created_at: 15.days.ago)
+        HousekeepingJobTest::TestJob.create!
 
-      assert_equal 10, HousekeepingJobTest::TestJob.count, -> { HousekeepingJobTest::TestJob.all.to_a.ai }
-    end
+        assert_equal 10, HousekeepingJobTest::TestJob.count, -> { HousekeepingJobTest::TestJob.all.to_a.ai }
+      end
 
-    after do
-      @job.destroy if @job && !@job.new_record?
+      after do
+        @job.destroy if @job && !@job.new_record?
+      end
+
+      describe 'perform' do
+        it 'destroys jobs' do
+          @job = RocketJob::Jobs::HousekeepingJob.new
+          @job.perform_now
+          assert_equal 1, HousekeepingJobTest::TestJob.aborted.count, -> { HousekeepingJobTest::TestJob.aborted.to_a.ai }
+          assert_equal 1, HousekeepingJobTest::TestJob.completed.count, -> { HousekeepingJobTest::TestJob.completed.to_a.ai }
+          assert_equal 1, HousekeepingJobTest::TestJob.failed.count, -> { HousekeepingJobTest::TestJob.failed.to_a.ai }
+          assert_equal 2, HousekeepingJobTest::TestJob.paused.count, -> { HousekeepingJobTest::TestJob.paused.to_a.ai }
+          assert_equal 2, HousekeepingJobTest::TestJob.queued.count, -> { HousekeepingJobTest::TestJob.queued.to_a.ai }
+        end
+      end
     end
 
-    describe 'perform' do
-      it 'destroys jobs' do
+    describe 'zombie cleanup' do
+      before do
+        @server = RocketJob::Server.new
+        @server.started!
+        assert @server.reload.zombie?
+        assert_equal 1, RocketJob::Server.count, -> { RocketJob::Server.all.to_a.ai }
+      end
+
+      it 'removes zombies' do
         @job = RocketJob::Jobs::HousekeepingJob.new
+        assert @job.destroy_zombies
         @job.perform_now
-        assert_equal 1, HousekeepingJobTest::TestJob.aborted.count, -> { HousekeepingJobTest::TestJob.aborted.to_a.ai }
-        assert_equal 1, HousekeepingJobTest::TestJob.completed.count, -> { HousekeepingJobTest::TestJob.completed.to_a.ai }
-        assert_equal 1, HousekeepingJobTest::TestJob.failed.count, -> { HousekeepingJobTest::TestJob.failed.to_a.ai }
-        assert_equal 2, HousekeepingJobTest::TestJob.paused.count, -> { HousekeepingJobTest::TestJob.paused.to_a.ai }
-        assert_equal 2, HousekeepingJobTest::TestJob.queued.count, -> { HousekeepingJobTest::TestJob.queued.to_a.ai }
+        assert_equal 0, RocketJob::Server.count, -> { RocketJob::Server.all.to_a.ai }
       end
+
+      it 'leaves zombies' do
+        @job = RocketJob::Jobs::HousekeepingJob.new(destroy_zombies: false)
+        refute @job.destroy_zombies
+        assert_equal 1, RocketJob::Server.count, -> { RocketJob::Server.all.to_a.ai }
+        @job.perform_now
+        assert_equal 1, RocketJob::Server.count, -> { RocketJob::Server.all.to_a.ai }
+      end
     end
+
   end
 end