canvas-jobs 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeda81334fe194eb27996d982198016d7c4dd9a1
-  data.tar.gz: c4698165803dc0ca24530a335e031d2f71725e69
+  metadata.gz: ea184ada62d200cf570338a65865761d2b168569
+  data.tar.gz: d11e965301438b83d7616bb76b98d42f4f6a5474
 SHA512:
-  metadata.gz: d543d4c884dd14f0084091d6942247d4e6816a5f6d3e31d8ac2c1bb612aecc7402ff1759136dd70eb0e874120b3539218de3e6fbf8c82ba5210a9c613f388e95
-  data.tar.gz: 0299d21693a0e48dfba4f56d7ca93d79c2355880637608650776012aa1a34047a322d0b47e8cd84e16afcb385ed39fa0c5b8a890f27535f803a1fe0848239b5d
+  metadata.gz: 376142657bad6c98367b711f03b7c9a269eb1b00545933ba367875c85e5e745ea46bf9ec5c37e17760f4fbb5758c80584b931b384fb3ff6e11bd3d2830de59b0
+  data.tar.gz: c56ed66abde1f4fe3dac5320d5c4e6406cfed5f20b62c465b8406ec1599ec312433af2341c1a60574d17573411eb03ef537c651bca10a029a0e2de7816a5a91f

data/lib/delayed/backend/active_record.rb

@@ -167,7 +167,7 @@ module Delayed
             scope = scope.where(locked_by: ON_HOLD_LOCKED_BY)
             scope.update_all(["locked_by = NULL, locked_at = NULL, attempts = 0, run_at = (CASE WHEN run_at > ? THEN run_at ELSE ? END), failed_at = NULL", now, now])
           when 'destroy'
-            scope = scope.where("locked_by IS NULL OR locked_by=?", ON_HOLD_LOCKED_BY)
+            scope = scope.where("locked_by IS NULL OR locked_by=?", ON_HOLD_LOCKED_BY) unless opts[:flavor] == 'failed'
             scope.delete_all
           end
         end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/active_record_job_spec.rb

@@ -69,34 +69,40 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
   end
 
   describe "bulk_update failed jobs" do
-    before do
-      @flavor = 'failed'
-      @affected_jobs = []
-      @ignored_jobs = []
-      Timecop.freeze(5.minutes.ago) do
-        5.times { @affected_jobs << create_job.tap { |j| j.fail! } }
-        @ignored_jobs << create_job(:run_at => 2.hours.from_now)
-        @ignored_jobs << create_job(:queue => 'q2')
+    context "holding/unholding failed jobs" do
+      before :each do
+        @job = Delayed::Job.create :payload_object => SimpleJob.new
+        Delayed::Job.get_and_lock_next_available('worker1').should == @job
+        @job.fail!
       end
-    end
 
-    it "should raise error when holding failed jobs" do
-      expect { Delayed::Job.bulk_update('hold', :flavor => @flavor, :query => @query) }.to raise_error
-    end
+      it "should raise error when holding failed jobs" do
+        expect { Delayed::Job.bulk_update('hold', :flavor => 'failed', :query => @query) }.to raise_error
+      end
 
-    it "should raise error holding or unholding failed jobs" do
-      expect { Delayed::Job.bulk_update('unhold', :flavor => @flavor, :query => @query) }.to raise_error
+      it "should raise error unholding failed jobs" do
+        expect { Delayed::Job.bulk_update('unhold', :flavor => 'failed', :query => @query) }.to raise_error
+      end
     end
 
-    it "should delete failed jobs by id" do
-      target_ids = Delayed::Job::Failed.all[0..2].map { |j| j.id }
-      Delayed::Job.bulk_update('destroy', :ids => target_ids, :flavor => @flavor, :query => @query).should == target_ids.length
-    end
+    context "deleting failed jobs" do
+      before :each do
+        2.times {
+          j = Delayed::Job.create(:payload_object => SimpleJob.new)
+          j.send(:lock_exclusively!, 'worker1').should == true
+          j.fail!
+        }
+      end
+
+      it "should delete failed jobs by id" do
+        target_ids = Delayed::Job::Failed.all[0..2].map { |j| j.id }
+        Delayed::Job.bulk_update('destroy', :ids => target_ids, :flavor => 'failed', :query => @query).should == target_ids.length
+      end
 
-    it "should delete all failed jobs" do
-      Delayed::Job.bulk_update('destroy', :flavor => @flavor, :query => @query).should == @affected_jobs.size
-      @affected_jobs.map { |j| Delayed::Job.find(j.id) rescue nil }.compact.should be_blank
-      @ignored_jobs.map { |j| Delayed::Job.find(j.id) rescue nil }.compact.size.should == @ignored_jobs.size
+      it "should delete all failed jobs" do
+        failed_count = Delayed::Job::Failed.count
+        Delayed::Job.bulk_update('destroy', :flavor => 'failed', :query => @query).should == failed_count
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -355,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job