Bug 503662 - Stop using tail_ files in xpcshell: use do_register_cleanup() instead. r=aceman

mail/base/test/unit/head_mailbase.js

@@ -12,3 +12,7 @@ var CC = Components.Constructor;
 do_get_profile();
 
 var gDEPTH = "../../../../";
+
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mail/base/test/unit/tail_base.js

@@ -1 +0,0 @@
-load("../../../../mailnews/resources/mailShutdown.js");

mail/base/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_mailbase.js
-tail = tail_base.js
+tail =
 support-files = distribution.ini resources/*
 
 [test_alertHook.js]

mail/base/test/unit/xpcshell_maildir.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_mailbase_maildir.js
-tail = tail_base.js
+tail =
 support-files = distribution.ini resources/*
 
 [test_viewWrapper_virtualFolder.js]

mail/components/test/unit/head_mailcomponents.js

@@ -12,3 +12,7 @@ var CC = Components.Constructor;
 do_get_profile();
 
 var gDEPTH = "../../../../";
+
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mail/components/test/unit/tail_mailcomponents.js

@@ -1 +0,0 @@
-load("../../../../mailnews/resources/mailShutdown.js");

mail/components/test/unit/xpcshell.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
 head = head_mailcomponents.js
-tail = tail_mailcomponents.js
+tail =
 
 [test_about_support.js]

mailnews/addrbook/test/unit/head_addrbook.js

@@ -12,3 +12,7 @@ do_get_profile();
 
 // Import the required setup scripts.
 load("../../../resources/abSetup.js");
+
+do_register_cleanup(function() {
+  load("../../../resources/mailShutdown.js");
+});

mailnews/addrbook/test/unit/tail_addrbook.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/addrbook/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_addrbook.js
-tail = tail_addrbook.js
+tail =
 support-files = data/*
 
 [test_basic_nsIAbCard.js]

mailnews/base/test/unit/head_mailbase.js

@@ -13,3 +13,7 @@ var CC = Components.Constructor;
 do_get_profile();
 
 var gDEPTH = "../../../../";
+
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/base/test/unit/tail_base.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/base/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_mailbase.js
-tail = tail_base.js
+tail =
 support-files = nodelist_test.xml data/*
 
 [test_accountMgr.js]

mailnews/compose/test/unit/head_compose.js

@@ -212,3 +212,6 @@ function getAttachmentFromContent(aContent) {
   return attachments[1];
 }
 
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/compose/test/unit/tail_compose.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/compose/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_compose.js
-tail = tail_compose.js
+tail =
 support-files = data/*
 
 [test_attachment.js]

mailnews/db/gloda/test/unit/head_gloda.js

@@ -14,3 +14,7 @@ do_get_profile();
 var gDEPTH = "../../../../../";
 
 // glodaTestHelper.js does all the rest of the imports
+
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/db/gloda/test/unit/tail_gloda.js

@@ -1 +0,0 @@
-load("../../../../resources/mailShutdown.js");

mailnews/db/gloda/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_gloda.js
-tail = tail_gloda.js
+tail =
 support-files = base_*.js resources/*
 
 [test_cleanup_msf_databases.js]

mailnews/db/msgdb/test/unit/head_maildb.js

@@ -11,3 +11,7 @@ var CC = Components.Constructor;
 
 // Ensure the profile directory is set up
 do_get_profile();
+
+do_register_cleanup(function() {
+  load("../../../../../mailnews/resources/mailShutdown.js");
+});

mailnews/db/msgdb/test/unit/tail_msgdb.js

@@ -1 +0,0 @@
-load("../../../../resources/mailShutdown.js");

mailnews/db/msgdb/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_maildb.js
-tail = tail_msgdb.js
+tail =
 
 [test_enumerator_cleanup.js]
 [test_filter_enumerator.js]

mailnews/extensions/bayesian-spam-filter/test/unit/head_bayes.js

@@ -21,3 +21,7 @@ function getSpec(aFileName)
   uri.query = "type=application/x-message-display";
   return uri.spec;
 }
+
+do_register_cleanup(function() {
+  load("../../../../resources/mailShutdown.js");
+});

mailnews/extensions/bayesian-spam-filter/test/unit/tail_bayesian.js

@@ -1 +0,0 @@
-load("../../../../resources/mailShutdown.js");

mailnews/extensions/bayesian-spam-filter/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_bayes.js
-tail = tail_bayesian.js
+tail =
 support-files = resources/*
 
 [test_bug228675.js]

mailnews/extensions/mdn/test/unit/head_mdn.js

@@ -10,3 +10,8 @@ var CC = Components.Constructor;
 
 // Ensure the profile directory is set up
 do_get_profile();
+
+
+do_register_cleanup(function() {
+  load("../../../../../mailnews/resources/mailShutdown.js");
+});

mailnews/extensions/mdn/test/unit/tail_mdn.js

@@ -1 +0,0 @@
-load("../../../../resources/mailShutdown.js");

mailnews/extensions/mdn/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_mdn.js
-tail = tail_mdn.js
+tail =
 
 [test_askuser.js]
 [test_mdnFlags.js]

mailnews/imap/test/unit/head_server.js

@@ -108,3 +108,6 @@ function addImapMessage()
   IMAPPump.mailbox.addMessage(imapMsg);
 }
 
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/imap/test/unit/tail_imap.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/imap/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_server.js
-tail = tail_imap.js
+tail =
 
 [test_autosync_date_constraints.js]
 [test_bccProperty.js]

mailnews/imap/test/unit/xpcshell_maildir.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_imap_maildir.js
-tail = tail_imap.js
+tail =
 
 [test_autosync_date_constraints.js]
 [test_bccProperty.js]

mailnews/import/test/unit/head_import.js

@@ -15,3 +15,7 @@ load("../../../resources/abSetup.js");
 
 // Import the script with basic import functions
 load("resources/import_helper.js");
+
+do_register_cleanup(function() {
+  load("../../../resources/mailShutdown.js");
+});

mailnews/import/test/unit/tail_import.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/import/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_import.js
-tail = tail_import.js
+tail =
 support-files = resources/*
 
 [test_bug_263304.js]

mailnews/jsaccount/test/unit/head_jsaccount.js

@@ -19,3 +19,7 @@ Cu.import("resource://testing-common/mailnews/localAccountUtils.js");
 do_load_manifest("resources/testComponents.manifest")
 // Ensure the profile directory is set up.
 do_get_profile();
+
+do_register_cleanup(function() {
+  load("../../../../mailnews/resources/mailShutdown.js");
+});

mailnews/jsaccount/test/unit/tail_jsaccount.js

@@ -1,6 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-load("../../../resources/mailShutdown.js");

mailnews/jsaccount/test/unit/xpcshell.ini

@@ -3,7 +3,7 @@
 
 [DEFAULT]
 head = head_jsaccount.js
-tail = tail_jsaccount.js
+tail =
 support-files = resources/*
 [test_componentsExist.js]
 [test_fooUrl.js]

mailnews/local/test/unit/head_maillocal.js

@@ -167,3 +167,6 @@ function setup_mailbox(type, mailboxPath) {
   return incomingServer.rootFolder;
 }
 
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/local/test/unit/tail_local.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/local/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_maillocal.js
-tail = tail_local.js
+tail =
 support-files = data/*
 
 [test_bug457168.js]

mailnews/mime/test/unit/head_mime.js

@@ -12,3 +12,7 @@ var CC = Components.Constructor;
 do_get_profile();
 
 var gDEPTH = "../../../../";
+
+do_register_cleanup(function() {
+  load(gDEPTH + "mailnews/resources/mailShutdown.js");
+});

mailnews/mime/test/unit/tail_mime.js

@@ -1 +0,0 @@
-load("../../../resources/mailShutdown.js");

mailnews/mime/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_mime.js
-tail = tail_mime.js
+tail =
 support-files = custom_header.js
 
 [test_EncodeMimePartIIStr_UTF8.js]

mailnews/news/test/unit/head_server_setup.js

@@ -249,3 +249,8 @@ var articleTextListener = {
     this.data += scriptStream.read(aCount);
   }
 };
+
+do_register_cleanup(function() {
+  load("../../../resources/mailShutdown.js");
+});
+

mailnews/news/test/unit/tail_news.js

@@ -1,5 +0,0 @@
-load("../../../resources/mailShutdown.js");
-
-if (_server)
-  _server.QueryInterface(Components.interfaces.nsISubscribableServer)
-         .subscribeCleanup();

mailnews/news/test/unit/xpcshell.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_server_setup.js
-tail = tail_news.js
+tail =
 support-files = postings/*
 
 [test_biff.js]