Bug 1449255: Part 26 - Rename test_bug1180901_2 to test_trash_directory.js. r=aswan
authorKris Maglione <maglione.k@gmail.com>
Tue, 27 Mar 2018 16:56:30 -0700
changeset 777737 52938f92e1d3185729275e398aad1a5b52585954
parent 777736 74241511b6b244bdfc44508c0bcc4365c4406181
child 777738 f2351acd6c6b73ee201e0a35f7c9eb9ac57c8094
push id105269
push userbmo:gl@mozilla.com
push dateThu, 05 Apr 2018 08:11:19 +0000
reviewersaswan
bugs1449255
milestone61.0a1
Bug 1449255: Part 26 - Rename test_bug1180901_2 to test_trash_directory.js. r=aswan MozReview-Commit-ID: JuQv3WQ1Hpt
toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
toolkit/mozapps/extensions/test/xpcshell/test_trash_directory.js
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
rename from toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
rename to toolkit/mozapps/extensions/test/xpcshell/test_trash_directory.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_trash_directory.js
@@ -1,17 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-function run_test() {
+add_task(async function setup() {
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  startupManager();
-  run_next_test();
-}
+  await promiseStartupManager();
+});
 
 add_task(async function() {
   let profileDir = OS.Constants.Path.profileDir;
   let trashDir = OS.Path.join(profileDir, "extensions", "trash");
   let testFile = OS.Path.join(trashDir, "test.txt");
 
   await OS.File.makeDir(trashDir, {
     from: profileDir,
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -71,18 +71,16 @@ tags = blocklist
 # Times out during parallel runs on desktop
 requesttimeoutfactor = 2
 tags = blocklist
 [test_bootstrap.js]
 skip-if = true # Bug 1358846 Bug 1365021 Bug 676992
 [test_bootstrap_const.js]
 [test_bootstrap_globals.js]
 [test_bootstrapped_chrome_manifest.js]
-[test_bug1180901_2.js]
-skip-if = os != "win"
 [test_bug566626.js]
 [test_cache_certdb.js]
 run-if = addon_signing
 [test_cacheflush.js]
 [test_childprocess.js]
 [test_compatoverrides.js]
 [test_corrupt.js]
 [test_corruptfile.js]
@@ -242,16 +240,18 @@ skip-if = true # Failing intermittently 
 [test_system_update_enterprisepolicy.js]
 skip-if = appname == "thunderbird"
 [test_system_update_fail.js]
 [test_system_update_newset.js]
 [test_system_update_overlapping.js]
 [test_system_update_upgrades.js]
 [test_temporary.js]
 tags = webextensions
+[test_trash_directory.js]
+skip-if = os != "win"
 [test_types.js]
 [test_undouninstall.js]
 skip-if = os == "win" # Bug 1358846
 [test_update.js]
 # Bug 676992: test consistently hangs on Android; bug 1330227 - linux
 skip-if = os == "android"
 [test_updateCancel.js]
 [test_update_compatmode.js]