From be9c8d9852ec6c8404a3c9b5f0ff1501f7eb851c Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Tue, 14 Aug 2012 14:40:35 +0100 Subject: [PATCH] Bug 782404 - Unhide some skipped xpcshell-tests. r=jcranmer --- mail/base/test/unit/test_windows_font_migration.js | 4 ---- mail/base/test/unit/xpcshell.ini | 1 + mailnews/imap/test/unit/test_imapAuthMethods.js | 7 ------- mailnews/imap/test/unit/test_localToImapFilter.js | 3 --- mailnews/imap/test/unit/test_offlineStoreLocking.js | 5 ----- mailnews/imap/test/unit/xpcshell.ini | 6 ++++++ mailnews/local/test/unit/test_fileName.js | 5 ----- mailnews/local/test/unit/test_movemailDownload.js | 6 ------ mailnews/local/test/unit/xpcshell.ini | 5 +++++ mailnews/news/test/unit/test_nntpContentLength.js | 3 --- mailnews/news/test/unit/xpcshell.ini | 2 ++ 11 files changed, 14 insertions(+), 33 deletions(-) diff --git a/mail/base/test/unit/test_windows_font_migration.js b/mail/base/test/unit/test_windows_font_migration.js index 765c1d9e63..45d05dedaf 100644 --- a/mail/base/test/unit/test_windows_font_migration.js +++ b/mail/base/test/unit/test_windows_font_migration.js @@ -380,10 +380,6 @@ var otherTests = [ ]; function run_test() { - // Only run on Windows. - if (!("@mozilla.org/windows-registry-key;1" in Components.classes)) - return; - reset_font_prefs(); for (let [, [version, verifier]] in Iterator(kWindowsVersions)) { diff --git a/mail/base/test/unit/xpcshell.ini b/mail/base/test/unit/xpcshell.ini index 727d5e1f1a..eea8eafa40 100644 --- a/mail/base/test/unit/xpcshell.ini +++ b/mail/base/test/unit/xpcshell.ini @@ -11,4 +11,5 @@ tail = tail_base.js [test_viewWrapper_virtualFolder.js] [test_viewWrapper_virtualFolderCustomTerm.js] [test_windows_font_migration.js] +skip-if = os != "win" [test_mailGlue_distribution.js] diff --git a/mailnews/imap/test/unit/test_imapAuthMethods.js b/mailnews/imap/test/unit/test_imapAuthMethods.js index eb75582f87..2799bb0970 100644 --- a/mailnews/imap/test/unit/test_imapAuthMethods.js +++ b/mailnews/imap/test/unit/test_imapAuthMethods.js @@ -140,13 +140,6 @@ function deleteIMAPServer(incomingServer) { function run_test() { - // XXX BUG 553764 XXX - // This unit test is relying on the random behavior of threads and so is - // being disabled. - dump("***\n***\nTHIS TEST IS DISABLED PER BUG 553764!\n***\n***\n"); - do_check_true(true); - return; - do_test_pending(); registerAlertTestUtils(); diff --git a/mailnews/imap/test/unit/test_localToImapFilter.js b/mailnews/imap/test/unit/test_localToImapFilter.js index 16cf7c3e04..e58df79f9c 100644 --- a/mailnews/imap/test/unit/test_localToImapFilter.js +++ b/mailnews/imap/test/unit/test_localToImapFilter.js @@ -163,8 +163,5 @@ function teardown() { } function run_test() { - // XXX Disabled due to intermittent failures, bug 502928 will fix. - return 0; - async_run_tests(tests); } diff --git a/mailnews/imap/test/unit/test_offlineStoreLocking.js b/mailnews/imap/test/unit/test_offlineStoreLocking.js index f59348ad45..0a02b6aad3 100644 --- a/mailnews/imap/test/unit/test_offlineStoreLocking.js +++ b/mailnews/imap/test/unit/test_offlineStoreLocking.js @@ -162,11 +162,6 @@ var tests = [ ]; function run_test() { - // XXX Disable on windows for now as it is failing there. - if ("@mozilla.org/windows-registry-key;1" in Cc) { - dump("Disabled on windows due to permanent failures\n"); - return; - } async_run_tests(tests); } diff --git a/mailnews/imap/test/unit/xpcshell.ini b/mailnews/imap/test/unit/xpcshell.ini index 2eace4dd71..8f6387dc4f 100644 --- a/mailnews/imap/test/unit/xpcshell.ini +++ b/mailnews/imap/test/unit/xpcshell.ini @@ -16,6 +16,8 @@ tail = tail_imap.js [test_filterNeedsBody.js] [test_imapAttachmentSaves.js] [test_imapAuthMethods.js] +# Disabled per bug 553764 +skip-if = true [test_imapAutoSync.js] [test_imapContentLength.js] [test_imapCopyTimeout.js] @@ -37,11 +39,15 @@ tail = tail_imap.js skip-if = os == 'mac' [test_listClosesDB.js] [test_localToImapFilter.js] +# Disabled due to intermittent failures, bug 502928 +skip-if = true [test_localToImapFilterQuarantine.js] [test_mailboxes.js] [test_nsIMsgFolderListenerIMAP.js] [test_offlinePlayback.js] [test_offlineStoreLocking.js] +# Doesn't currently work on Windows, bug 782625 +skip-if = os == "win" [test_partsOnDemand.js] [test_preserveDataOnMove.js] [test_saveImapDraft.js] diff --git a/mailnews/local/test/unit/test_fileName.js b/mailnews/local/test/unit/test_fileName.js index cf22c4c963..947e9dfe44 100644 --- a/mailnews/local/test/unit/test_fileName.js +++ b/mailnews/local/test/unit/test_fileName.js @@ -7,11 +7,6 @@ var server; function run_test() { - // Currently, we're only doing a mac-specific test. If we extend - // this test to include other platforms, we'd need to only do the - // ':' file name test on the mac. - if (! ("nsILocalFileMac" in Components.interfaces)) - return; // test file with ':' in the name (generated from Mozilla 1.8 branch). let bugmail = do_get_file("../../../data/bugmail-1"); let bugmailmsf = do_get_file("../../../data/bugmail-1.msf"); diff --git a/mailnews/local/test/unit/test_movemailDownload.js b/mailnews/local/test/unit/test_movemailDownload.js index c72133a074..d5f18a4638 100644 --- a/mailnews/local/test/unit/test_movemailDownload.js +++ b/mailnews/local/test/unit/test_movemailDownload.js @@ -22,12 +22,6 @@ var gMoveMailInbox; function run_test() { - // disable test on windows. - if ("@mozilla.org/windows-registry-key;1" in Cc) { - do_test_finished(); - return; - } - loadLocalMailAccount(); let acctMgr = Cc["@mozilla.org/messenger/account-manager;1"] diff --git a/mailnews/local/test/unit/xpcshell.ini b/mailnews/local/test/unit/xpcshell.ini index 0676e5f69d..fa777ee822 100644 --- a/mailnews/local/test/unit/xpcshell.ini +++ b/mailnews/local/test/unit/xpcshell.ini @@ -4,10 +4,15 @@ tail = tail_local.js [test_bug457168.js] [test_fileName.js] +# Currently, we're only doing a mac-specific test. If we extend +# this test to include other platforms, we'd need to only do the +# ':' file name test on the mac. +skip-if = os != "mac" [test_localFolder.js] [test_mailboxContentLength.js] [test_mailboxProtocol.js] [test_movemailDownload.js] +skip-if = os == "win" [test_msgCopy.js] [test_msgIDParsing.js] [test_nsIMsgLocalMailFolder.js] diff --git a/mailnews/news/test/unit/test_nntpContentLength.js b/mailnews/news/test/unit/test_nntpContentLength.js index e7521541ba..011d0330b3 100644 --- a/mailnews/news/test/unit/test_nntpContentLength.js +++ b/mailnews/news/test/unit/test_nntpContentLength.js @@ -18,9 +18,6 @@ var server; var localserver; function run_test() { - // XXX The server doesn't support returning sizes! - return; - type = "RFC 977"; localserver = setupLocalServer(NNTP_PORT); server = makeServer(NNTP_RFC977_handler, daemon); diff --git a/mailnews/news/test/unit/xpcshell.ini b/mailnews/news/test/unit/xpcshell.ini index 7ba5e06388..59ed077f29 100644 --- a/mailnews/news/test/unit/xpcshell.ini +++ b/mailnews/news/test/unit/xpcshell.ini @@ -11,6 +11,8 @@ tail = tail_news.js [test_getNewsMessage.js] [test_internalUris.js] [test_nntpContentLength.js] +# The server doesn't support returning sizes! (bug 782629) +skip-if = true [test_nntpGroupPassword.js] [test_nntpPassword.js] [test_nntpPassword2.js]