Browse Source

Report results properly to test.py from driver.js.

If the PDFDoc creation failed in driver.js then that was not informed back to
test.py. This lead to State.remaining being off by one. And that did not let
the test to end as expected. Instead the test hung indefinitely.

This change now reveals TEST-UNEXPECTED-FAIL which was hidden previously.
Kalervo Kujala 14 years ago
parent
commit
7cbdc982c5
  1. 19
      test/driver.js

19
test/driver.js

@ -80,10 +80,19 @@ function nextTask() {
} }
function isLastPage(task) { function isLastPage(task) {
return (!task.pdfDoc || (task.pageNum > task.pdfDoc.numPages)); return (task.pageNum > task.pdfDoc.numPages);
} }
function nextPage(task, loadError) { function nextPage(task, loadError) {
var failure = loadError || '';
if (!task.pdfDoc) {
sendTaskResult(canvas.toDataURL('image/png'), task, failure);
log('done' + (failure ? ' (failed !: ' + failure + ')' : '') + '\n');
++currentTaskIdx, nextTask();
return;
}
if (isLastPage(task)) { if (isLastPage(task)) {
if (++task.round < task.rounds) { if (++task.round < task.rounds) {
log(' Round ' + (1 + task.round) + '\n'); log(' Round ' + (1 + task.round) + '\n');
@ -94,15 +103,13 @@ function nextPage(task, loadError) {
} }
} }
var failure = loadError || '';
var ctx = null;
var page = null; var page = null;
if (!failure) { if (!failure) {
try { try {
log(' loading page ' + task.pageNum + '/' + task.pdfDoc.numPages + log(' loading page ' + task.pageNum + '/' + task.pdfDoc.numPages +
'... '); '... ');
ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
page = task.pdfDoc.getPage(task.pageNum); page = task.pdfDoc.getPage(task.pageNum);
var pdfToCssUnitsCoef = 96.0 / 72.0; var pdfToCssUnitsCoef = 96.0 / 72.0;
@ -179,7 +186,7 @@ var inFlightRequests = 0;
function sendTaskResult(snapshot, task, failure) { function sendTaskResult(snapshot, task, failure) {
var result = { browser: browser, var result = { browser: browser,
id: task.id, id: task.id,
numPages: task.pdfDoc.numPages, numPages: task.pdfDoc ? task.pdfDoc.numPages : 0,
failure: failure, failure: failure,
file: task.file, file: task.file,
round: task.round, round: task.round,

Loading…
Cancel
Save