Bug 1332868: Fix shutdown race in test_ext_contentscript_permission. r?krizsa
MozReview-Commit-ID: EVMcSdU3fTG
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_permission.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_contentscript_permission.html
@@ -10,27 +10,29 @@
</head>
<body>
<script type="text/javascript">
"use strict";
add_task(function* test_contentscript() {
function background() {
- browser.test.onMessage.addListener(url => {
- browser.tabs.create({url}).then(tab => {
- return browser.tabs.executeScript(tab.id, {code: "true;"})
- .then(() => {
- browser.test.sendMessage("executed", true);
- browser.tabs.remove([tab.id]);
- }, err => {
- browser.test.sendMessage("executed", false);
- browser.tabs.remove([tab.id]);
- });
- });
+ browser.test.onMessage.addListener(async url => {
+ let tab = await browser.tabs.create({url});
+
+ let executed = true;
+ try {
+ await browser.tabs.executeScript(tab.id, {code: "true;"});
+ } catch (e) {
+ executed = false;
+ }
+
+ await browser.tabs.remove([tab.id]);
+
+ browser.test.sendMessage("executed", executed);
});
}
let extensionData = {
manifest: {
permissions: ["<all_urls>"],
},
background,