add error queue and download testcases in result hook

Author: jatinkatyal13

src/taskmaster.ts

@@ -15,8 +15,9 @@ Raven.config(config.SENTRY.DSN, {
 }).install()
 // =============== Setup Raven
 
-let jobQ = 'job_queue'
-let successQ = 'success_queue'
+const jobQ = 'job_queue'
+const successQ = 'success_queue'
+const errorQ = 'error_queue'
 
 mkdir('-p', config.RUNBOX.DIR)
 
@@ -27,6 +28,7 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
 
     channel.assertQueue(successQ);
     channel.assertQueue(jobQ);
+    channel.assertQueue(errorQ);
     channel.consume(jobQ, async (msg) => {
       try {
         const payload = JSON.parse(msg.content.toString())      
@@ -45,11 +47,10 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
 
         const jobResult = await execute(job)
 
-        // TODO
-        channel.sendToQueue(successQ, (new Buffer(JSON.stringify(jobResult))))
-        
+        channel.sendToQueue(successQ, (new Buffer(JSON.stringify(jobResult))))  
       } catch (err) {
         Raven.captureException(err);
+        channel.sendToQueue(errorQ, (new Buffer(msg.content)))
       }
       channel.ack(msg)
     })

src/tasks/scenarios/submission.ts

@@ -31,11 +31,10 @@ class SubmissionScenario extends Scenario {
     const testCasesDir = path.join(currentJobDir, 'testcases')
     mkdir('-p', testCasesDir)
 
-    return Promise.all(job.testcases.map(async testcase => {
+    return Promise.all(job.testcases.map(testcase => {
       const rootDir = path.join(testCasesDir, '' + testcase.id)
       mkdir('-p', rootDir)      
-      const input = await download(testcase.input, path.join(rootDir, 'stdin'))
-      const output = await download(testcase.output, path.join(rootDir, 'stdout'))
+      return download(testcase.input, path.join(rootDir, 'stdin'))
     }))
   }
 
@@ -51,6 +50,11 @@ class SubmissionScenario extends Scenario {
       }
     }
 
+    await Promise.all(job.testcases.map(async testcase => {
+      const rootDir = path.join(currentJobDir, 'testcases', '' + testcase.id)
+      return download(testcase.output, path.join(rootDir, 'stdout'))
+    }))
+
     const testcases = ls(path.join(currentJobDir, 'testcases')).map(testcase => {
       const currentTestcasePath = path.join(currentJobDir, 'testcases', testcase)
 

test/scenarios/submissionScenario.spec.ts

@@ -43,8 +43,8 @@ describe('Submission Scenario', () => {
     const stdin = fs.readFileSync(path.join(currentJobDir, 'testcases', '' + job.testcases[0].id, 'stdin')).toString()
     expect(stdin.trim()).to.eq('World')
 
-    const stdout = fs.readFileSync(path.join(currentJobDir, 'testcases', '' + job.testcases[0].id, 'stdout')).toString()
-    expect(stdout.trim()).to.eq('Hello World')
+    const stdout = () => fs.readFileSync(path.join(currentJobDir, 'testcases', '' + job.testcases[0].id, 'stdout')).toString()
+    expect(stdout).to.throw()
 
   })
 })