Commit 0f08bc57 authored by Zack Weinberg's avatar Zack Weinberg
Browse files

Bug 663291 ride-along: reactivate the web worker error propagation tests (from... 

Bug 663291 ride-along: reactivate the web worker error propagation tests (from bug 595394, disabled in bug 692605). r=ted

--HG--
extra : rebase_source : a01f9c3461f4af611e7fdeb442d001bb694a99ec
parent ff35201b

dom/workers/test/errorPropagation_iframe.html

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
              type: "window",

              data: { message: message, filename: filename, lineno: lineno }

            });

            return true;

          }

          return false;

        };



        worker = new Worker("errorPropagation_worker.js");

dom/workers/test/test_errorPropagation.html

+20 −6
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
        }

        else if (event.type == "window") {

          windowErrorCount++;

          workerFrame.stop();

          // do this via executeSoon to give the workers a chance to

          // be cleaned up

          SimpleTest.executeSoon(SimpleTest.endMonitorConsole);

        }

        else {

          ok(false, "Bad event type: " + event.type);
@@ -45,17 +49,27 @@ 
        is(event.data.filename, errorFilename,

           "Correct message event.filename");

        is(event.data.lineno, errorLineno, "Correct message event.lineno");

      }



        if (windowErrorCount == 1) {

      function finish() {

        is(scopeErrorCount, workerCount, "Good number of scope errors");

        is(workerErrorCount, workerCount, "Good number of worker errors");

          workerFrame.stop();

        is(windowErrorCount, 1, "Good number of window errors");

        SimpleTest.finish();

      }

      }



      function workerFrameLoaded() {

        workerFrame = document.getElementById("workerFrame").contentWindow;



        SimpleTest.monitorConsole(finish, [

          { 'isScriptError': true,

            'isWarning': false,

            'isException': false,

            'sourceName': errorFilename,

            'lineNumber': errorLineno,

            'errorMessage': errorMessage }

        ]);



        workerFrame.start(workerCount, messageListener);

      }