fix test.py bug on windows and stomped failure messages

diff --git a/test/test.py b/test/test.py
index 52e91476a3d110a5ccac549928b9500aad941476..367347e8814cd52f46ee0fa3092a414daa11b49b 100644 (file)
--- a/test/test.py
+++ b/test/test.py
@@ -99,7 +99,7 @@ class PDFTestHandler(BaseHTTPRequestHandler):
         self.send_header("Content-Type", MIMEs[ext])
         self.send_header("Content-Length", os.path.getsize(path))
         self.end_headers()
-        with open(path) as f:
+        with open(path, "rb") as f:
             self.wfile.write(f.read())
 
     def do_GET(self):

diff --git a/test/test_slave.html b/test/test_slave.html
index 3180418fa86d48efe7187532d6a79f5c80da24cb..0bf254ad5d515146a3a284004c02df6a299105d0 100644 (file)
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -88,31 +88,35 @@ function nextPage() {
     }
   }
 
-  failure = '';
-  log("    loading page "+ currentTask.pageNum +"... ");
-
-  var ctx = canvas.getContext("2d");
-
-  var fonts = [];
-  var gfx = null;
-  try {
-    gfx = new CanvasGraphics(ctx);
-    currentPage = pdfDoc.getPage(currentTask.pageNum);
-    currentPage.compile(gfx, fonts);
-  } catch(e) {
-    failure = 'compile: '+ e.toString();
+  var ctx, fonts, gfx;
+  if (!failure) {
+    log("    loading page "+ currentTask.pageNum +"... ");
+
+    ctx = canvas.getContext("2d");
+
+    fonts = [];
+    gfx = null;
+    try {
+      gfx = new CanvasGraphics(ctx);
+      currentPage = pdfDoc.getPage(currentTask.pageNum);
+      currentPage.compile(gfx, fonts);
+    } catch(e) {
+      failure = 'compile: '+ e.toString();
+    }
   }
 
-  try {
-    var pdfToCssUnitsCoef = 96.0 / 72.0;
-    // using mediaBox for the canvas size
-    var pageWidth = (currentPage.mediaBox[2] - currentPage.mediaBox[0]);
-    var pageHeight = (currentPage.mediaBox[3] - currentPage.mediaBox[1]);
-    canvas.width = pageWidth * pdfToCssUnitsCoef;
-    canvas.height = pageHeight * pdfToCssUnitsCoef;
-    clear(ctx);
-  } catch(e) {
-    failure = 'page setup: '+ e.toString();
+  if (!failure) {
+    try {
+      var pdfToCssUnitsCoef = 96.0 / 72.0;
+      // using mediaBox for the canvas size
+      var pageWidth = (currentPage.mediaBox[2] - currentPage.mediaBox[0]);
+      var pageHeight = (currentPage.mediaBox[3] - currentPage.mediaBox[1]);
+      canvas.width = pageWidth * pdfToCssUnitsCoef;
+      canvas.height = pageHeight * pdfToCssUnitsCoef;
+      clear(ctx);
+    } catch(e) {
+      failure = 'page setup: '+ e.toString();
+    }
   }
 
   if (!failure) {
@@ -145,6 +149,7 @@ function snapshotCurrentPage(gfx) {
   log("done"+ (failure ? " (failed!)" : "") +"\n");
 
   // Set up the next request
+  failure = '';
   backoff = (inFlightRequests > 0) ? inFlightRequests * 10 : 0;
   setTimeout(function() {
       ++currentTask.pageNum, nextPage();