| OLD | NEW |
| 1 if (window.testRunner) { | 1 if (window.testRunner) { |
| 2 testRunner.dumpAsText(); | 2 testRunner.dumpAsText(); |
| 3 testRunner.waitUntilDone(); | 3 testRunner.waitUntilDone(); |
| 4 } | 4 } |
| 5 | 5 |
| 6 var console_messages = document.createElement("ul"); | 6 var console_messages = document.createElement("ul"); |
| 7 document.body.appendChild(console_messages); | 7 document.body.appendChild(console_messages); |
| 8 | 8 |
| 9 function log(message) | 9 function log(message) |
| 10 { | 10 { |
| 11 var item = document.createElement("li"); | 11 var item = document.createElement("li"); |
| 12 item.appendChild(document.createTextNode(message)); | 12 item.appendChild(document.createTextNode(message)); |
| 13 console_messages.appendChild(item); | 13 console_messages.appendChild(item); |
| 14 } | 14 } |
| 15 | 15 |
| 16 var progress_ticks = 0; | 16 var progress_ticks = 0; |
| 17 var worker = createWorker('resources/upload-onprogress-worker.js'); | 17 var worker = createWorker('resources/xmlhttprequest-timeout-override-worker.js')
; |
| 18 var messages = []; |
| 18 worker.onmessage = function(evt) | 19 worker.onmessage = function(evt) |
| 19 { | 20 { |
| 20 if (/log .+/.test(evt.data)) { | 21 if (/log .+/.test(evt.data)) { |
| 21 log(evt.data.substr(4)); | 22 var msg = evt.data.substr(4); |
| 22 } else if (/tick .+/.test(evt.data)) { | 23 messages.push(msg); |
| 23 progress_ticks++; | 24 log(msg); |
| 24 } else if (/DONE/.test(evt.data)) { | 25 } else if (/DONE/.test(evt.data)) { |
| 25 log(progress_ticks >= 1 ? "PASS" : "FAIL"); | 26 log(messages.length === 1 && messages[0] === "timeout" ? "PASS" : "FAIL"
); |
| 26 if (window.testRunner) | 27 if (window.testRunner) |
| 27 testRunner.notifyDone(); | 28 testRunner.notifyDone(); |
| 28 } | 29 } |
| 29 } | 30 } |
| OLD | NEW |