Bug 541707 - semi-random failures in test_crashing2.html, probably due to interminism in the crash/crashreport/reload sequence

--HG--
extra : rebase_source : eaa6c45f5383e14b7d64dc71bc84c91256144864
This commit is contained in:
Benjamin Smedberg 2010-01-27 08:49:36 -05:00
Родитель 0db41ce779
Коммит 0203e38ac8
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -51,27 +51,29 @@
var p = iframe.contentDocument.getElementById('plugin1'); var p = iframe.contentDocument.getElementById('plugin1');
try { try {
p.setColor('FF00FF00'); p.setColor('FF00FF00');
ok(true, "Reloading worked"); ok(true, "Reloading after crash-on-new worked");
} }
catch (e) { catch (e) {
ok(false, "Reloading didn't give us a usable plugin"); ok(false, "Reloading after crash-on-new didn't give us a usable plugin");
} }
p.crashOnDestroy(); p.crashOnDestroy();
// the child crash should happen here // the child crash should happen here
p.parentNode.removeChild(p); p.parentNode.removeChild(p);
window.frameLoaded = reloaded2; window.frameLoaded = reloaded2;
iframe.contentWindow.location.reload(); SimpleTest.executeSoon(function() {
iframe.contentWindow.location.reload();
});
} }
function reloaded2() { function reloaded2() {
var p = iframe.contentDocument.getElementById('plugin1'); var p = iframe.contentDocument.getElementById('plugin1');
try { try {
p.setColor('FF00FF00'); p.setColor('FF00FF00');
ok(true, "Reloading worked"); ok(true, "Reloading after crash-on-destroy worked");
} }
catch (e) { catch (e) {
ok(false, "Reloading didn't give us a usable plugin"); ok(false, "Reloading after crash-on-destroy didn't give us a usable plugin");
} }
SimpleTest.finish(); SimpleTest.finish();
} }