Merge pull request #328 from kkujala/master
Report results properly to test.py from driver.js.
This commit is contained in:
commit
2d1b356e66
@ -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…
x
Reference in New Issue
Block a user