htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename attribute and restructure conditions

Browse Source
This commit is contained in:
Maximilian Grundke
2017-11-29 10:39:05 +01:00
parent 1369f9285b
commit 32c274d455
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/submission_scoring.rb
View File

@ -9,7 +9,7 @@ module SubmissionScoring
assessment = assessor.assess(output) assessment = assessor.assess(output)
passed = ((assessment[:passed] == assessment[:count]) and (assessment[:score] > 0)) passed = ((assessment[:passed] == assessment[:count]) and (assessment[:score] > 0))
testrun_output = passed ? nil : 'message: ' + output[:message].to_s + "\n stdout: " + output[:stdout].to_s + "\n stderr: " + output[:stderr].to_s testrun_output = passed ? nil : 'message: ' + output[:message].to_s + "\n stdout: " + output[:stdout].to_s + "\n stderr: " + output[:stderr].to_s
if !testrun_output.blank? unless testrun_output.blank?
submission.exercise.execution_environment.error_templates.each do |template| submission.exercise.execution_environment.error_templates.each do |template|
pattern = Regexp.new(template.signature).freeze pattern = Regexp.new(template.signature).freeze
if pattern.match(testrun_output) if pattern.match(testrun_output)

6
app/controllers/submissions_controller.rb
View File

@ -203,11 +203,11 @@ class SubmissionsController < ApplicationController
end end
def extract_errors def extract_errors
if !@message_buffer.blank? unless @run_output.blank?
@submission.exercise.execution_environment.error_templates.each do |template| @submission.exercise.execution_environment.error_templates.each do |template|
pattern = Regexp.new(template.signature).freeze pattern = Regexp.new(template.signature).freeze
if pattern.match(@message_buffer) if pattern.match(@run_output)
StructuredError.create_from_template(template, @message_buffer) StructuredError.create_from_template(template, @run_output)
end end
end end
end end