DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5371 from betagouv/ignore-virus-scan-jobs-missing-files

Browse source 
Les jobs d'analyse anti-virus ne sont plus relancés si le fichier cible n'existe plus
This commit is contained in:
Pierre de La Morinerie 2020-07-13 16:12:46 +02:00 committed by GitHub
commit 640778641e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/virus_scanner_job.rb
View file

@ -1,4 +1,6 @@
class VirusScannerJob < ApplicationJob
discard_on ActiveRecord::RecordNotFound
def perform(blob)
metadata = extract_metadata_via_virus_scanner(blob)
blob.update!(metadata: blob.metadata.merge(metadata))

23
spec/jobs/virus_scanner_job_spec.rb
View file

@ -1,11 +1,18 @@
RSpec.describe VirusScannerJob, type: :job do
include ActiveJob::TestHelper
let(:champ) do
champ = create(:champ, :piece_justificative)
champ.piece_justificative_file.attach(io: StringIO.new("toto"), filename: "toto.txt", content_type: "text/plain")
champ.save
champ
end
subject { VirusScannerJob.new.perform(champ.piece_justificative_file.blob) }
subject do
perform_enqueued_jobs do
VirusScannerJob.perform_later(champ.piece_justificative_file.blob)
end
end
context "when no virus is found" do
let(:virus_found?) { true }
@ -15,7 +22,7 @@ RSpec.describe VirusScannerJob, type: :job do
subject
end
it { expect(champ.piece_justificative_file.virus_scanner.safe?).to be_truthy }
it { expect(champ.reload.piece_justificative_file.virus_scanner.safe?).to be_truthy }
end
context "when a virus is found" do
@ -26,6 +33,16 @@ RSpec.describe VirusScannerJob, type: :job do
subject
end
it { expect(champ.piece_justificative_file.virus_scanner.infected?).to be_truthy }
it { expect(champ.reload.piece_justificative_file.virus_scanner.infected?).to be_truthy }
end
context "when the blob has been deleted" do
before do
Champ.find(champ.id).piece_justificative_file.purge
end
it "ignores the error" do
expect { subject }.not_to raise_error
end
end
end