Bug 925489 - Perma-fail: test_bug155172.js | test failed (with xpcshell return code: 0) and a bunch more. r=standard8,a=Standard8 for CLOSED TREE

mailnews/compose/test/unit/data/signons-smtp.txt

@@ -1,8 +0,0 @@
-#2c
-.
-smtp://test.smtp%40fakeserver@localhost
-\=username=\
-~
-*\=password=\
-~c210cHRlc3Q=
-.

mailnews/compose/test/unit/head_compose.js

@@ -13,6 +13,8 @@ var CC = Components.Constructor;
 // Ensure the profile directory is set up
 do_get_profile();
 
+var gDEPTH = "../../../../";
+
 // Import the required setup scripts.
 load("../../../resources/abSetup.js");
 

mailnews/compose/test/unit/test_bug155172.js

@@ -4,6 +4,7 @@
  */
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 Components.utils.import("resource:///modules/mailServices.js");
 
@@ -47,11 +48,8 @@ function run_test() {
   server = setupServerDaemon(createHandler);
   server.setDebugLevel(fsDebugAll);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("data/signons-smtp.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-smtp.sqlite")
 
   // Test file
   var testFile = do_get_file("data/message1.eml");

mailnews/compose/test/unit/test_smtpPassword.js

@@ -5,6 +5,8 @@
 
 Components.utils.import("resource:///modules/mailServices.js");
 
+load("../../../resources/passwordStorage.js");
+
 var server;
 
 const kSender = "from@foo.invalid";
@@ -24,11 +26,8 @@ function run_test() {
   }
   server = setupServerDaemon(createHandler);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   // Test file
   var testFile = do_get_file("data/message1.eml");

mailnews/compose/test/unit/test_smtpPassword2.js

@@ -5,6 +5,8 @@
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+load("../../../resources/passwordStorage.js");
+
 const kUser1 = "testsmtp";
 const kUser2 = "testsmtpa";
 const kProtocol = "smtp";
@@ -13,11 +15,8 @@ const kServerUrl = kProtocol + "://" + kHostname;
 
 function run_test()
 {
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8-multiple.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8-multiple.sqlite")
 
   // Set up the basic accounts and folders.
   localAccountUtils.loadLocalMailAccount();

mailnews/compose/test/unit/test_smtpPasswordFailure1.js

@@ -15,6 +15,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var server;
 var attempt = 0;
@@ -64,11 +65,8 @@ function run_test() {
   }
   server = setupServerDaemon(createHandler);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/compose/test/unit/test_smtpPasswordFailure2.js

@@ -15,6 +15,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var server;
 var attempt = 0;
@@ -75,11 +76,8 @@ function run_test() {
   }
   server = setupServerDaemon(createHandler);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/compose/test/unit/test_smtpPasswordFailure3.js

@@ -13,6 +13,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var server;
 var attempt = 0;
@@ -74,11 +75,8 @@ function run_test() {
   }
   server = setupServerDaemon(createHandler);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/imap/test/unit/test_imapPasswordFailure.js

@@ -13,6 +13,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 const kUserName = "user";
 const kInvalidPassword = "imaptest";
@@ -59,11 +60,8 @@ function promptPasswordPS(aParent, aDialogTitle, aText, aPassword, aCheckMsg,
 function run_test() {
   do_test_pending();
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  let signons = do_get_file("../../../data/signons-mailnews1.8-imap.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8-imap.sqlite")
 
   registerAlertTestUtils();
 

mailnews/local/test/unit/test_pop3Password.js

@@ -5,6 +5,8 @@
 
 Components.utils.import("resource:///modules/mailServices.js");
 
+load("../../../resources/passwordStorage.js");
+
 var test = null;
 var server;
 var daemon;
@@ -118,11 +120,8 @@ function run_test() {
   Services.prefs.setBoolPref("mail.biff.show_tray_icon", false);
   Services.prefs.setBoolPref("mail.biff.animate_dock_icon", false);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   // Set up the Server
   var serverArray = setupServerDaemon();

mailnews/local/test/unit/test_pop3Password2.js

@@ -7,6 +7,8 @@
 
 Components.utils.import("resource:///modules/mailServices.js");
 
+load("../../../resources/passwordStorage.js");
+
 var test = null;
 var server;
 var daemon;
@@ -147,11 +149,8 @@ function run_test() {
   Services.prefs.setCharPref("mail.server.server2.type", "pop3");
   Services.prefs.setCharPref("mail.server.server2.userName", "othername");
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8-alt.txt");
-
-  // Copy the file to the profile directory
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8-alt.sqlite")
 
   // Set up the Server
   var serverArray = setupServerDaemon();

mailnews/local/test/unit/test_pop3Password3.js

@@ -6,6 +6,8 @@
 Components.utils.import("resource:///modules/mailServices.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+load("../../../resources/passwordStorage.js");
+
 const kUser1 = "testpop3";
 const kUser2 = "testpop3a";
 const kProtocol = "pop3";
@@ -14,11 +16,8 @@ const kServerUrl = "mailbox://" + kHostname;
 
 function run_test()
 {
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8-multiple.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8-multiple.sqlite")
 
   // Set up the basic accounts and folders.
   // We would use createPop3ServerAndLocalFolders() however we want to have

mailnews/local/test/unit/test_pop3PasswordFailure.js

@@ -14,6 +14,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var test = null;
 var server;
@@ -157,11 +158,8 @@ function run_test()
   Services.prefs.setBoolPref("mail.biff.animate_dock_icon", false);
   Services.prefs.setBoolPref("signon.debug", true);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  let signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/local/test/unit/test_pop3PasswordFailure2.js

@@ -15,6 +15,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 load("../../../resources/logHelper.js");
 load("../../../resources/asyncTestUtils.js");
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var test = null;
 var server;
@@ -172,11 +173,8 @@ function run_test()
   Services.prefs.setBoolPref("mail.biff.animate_dock_icon", false);
   Services.prefs.setBoolPref("signon.debug", true);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  let signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/local/test/unit/test_pop3PasswordFailure3.js

@@ -17,6 +17,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 load("../../../resources/logHelper.js");
 load("../../../resources/asyncTestUtils.js");
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var test = null;
 var server;
@@ -174,11 +175,8 @@ function run_test()
   Services.prefs.setBoolPref("mail.biff.animate_dock_icon", false);
   Services.prefs.setBoolPref("signon.debug", true);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  let signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/news/test/unit/head_server_setup.js

@@ -11,6 +11,8 @@ var CC = Components.Constructor;
 // Ensure the profile directory is set up
 do_get_profile();
 
+var gDEPTH = "../../../../";
+
 // Import the servers
 Components.utils.import("resource://testing-common/mailnews/maild.js");
 Components.utils.import("resource://testing-common/mailnews/nntpd.js");

mailnews/news/test/unit/test_nntpPassword.js

@@ -6,6 +6,8 @@
  * default port or the SSL default port. Nothing else!
  */
 
+load("../../../resources/passwordStorage.js");
+
 // The basic daemon to use for testing nntpd.js implementations
 var daemon = setupNNTPDaemon();
 
@@ -16,11 +18,8 @@ var test = null;
 function run_test() {
   type = "RFC 4643";
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   var server = makeServer(NNTP_RFC4643_extension, daemon);
   server.start(NNTP_PORT);

mailnews/news/test/unit/test_nntpPassword2.js

@@ -9,6 +9,8 @@
 
 Components.utils.import("resource:///modules/mailServices.js");
 
+load("../../../resources/passwordStorage.js");
+
 // The basic daemon to use for testing nntpd.js implementations
 var daemon = setupNNTPDaemon();
 
@@ -53,11 +55,8 @@ function run_test() {
 
   type = "RFC 4643";
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8-alt.txt");
-
-  // Copy the file to the profile directory
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8-alt.sqlite")
 
   var server = makeServer(NNTP_RFC4643_extension, daemon);
   server.start(NNTP_PORT);

mailnews/news/test/unit/test_nntpPassword3.js

@@ -6,6 +6,8 @@
 Components.utils.import("resource:///modules/mailServices.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+load("../../../resources/passwordStorage.js");
+
 const kUsername = "testnews";
 const kPassword = "newstest";
 const kProtocol = "nntp";
@@ -14,11 +16,8 @@ const kServerUrl = "news://" + kHostname;
 
 function run_test()
 {
-  // Passwords File (generated from Mozilla 1.8 branch).
-  var signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   // Set up the basic accounts and folders.
   localAccountUtils.loadLocalMailAccount();

mailnews/news/test/unit/test_nntpPasswordFailure.js

@@ -15,6 +15,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 load("../../../resources/logHelper.js");
 load("../../../resources/asyncTestUtils.js");
 load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
 
 var test = null;
 var server;
@@ -167,11 +168,8 @@ function run_test()
   Services.prefs.setBoolPref("mail.biff.animate_dock_icon", false);
   Services.prefs.setBoolPref("signon.debug", true);
 
-  // Passwords File (generated from Mozilla 1.8 branch).
-  let signons = do_get_file("../../../data/signons-mailnews1.8.txt");
-
-  // Copy the file to the profile directory for a PAB
-  signons.copyTo(do_get_profile(), "signons.txt");
+  // Prepare files for passwords (generated by a script in bug 925489).
+  setupForPassword("signons-mailnews1.8.sqlite")
 
   registerAlertTestUtils();
 

mailnews/test/data/signons-mailnews1.8-alt.txt

@@ -1,20 +0,0 @@
-#2c
-.
-mailbox://othername@invalid
-\=username=\
-~b3RoZXJuYW1l
-*\=password=\
-~cG9wM3Rlc3Q=
-.
-news://invalid:119/#password
-\=username=\
-~
-*\=password=\
-~bmV3c3Rlc3Q=
-.
-news://invalid:119/#username
-\=username=\
-~
-*\=password=\
-~dGVzdG5ld3M=
-.

mailnews/test/data/signons-mailnews1.8-imap.txt

@@ -1,8 +0,0 @@
-#2c
-.
-imap://user@localhost
-\=username=\
-~
-*\=password=\
-~aW1hcHRlc3Q=
-.

mailnews/test/data/signons-mailnews1.8-multiple.txt

@@ -1,26 +0,0 @@
-#2c
-.
-mailbox://testpop3@localhost
-\=username=\
-~
-*\=password=\
-~cG9wM3Rlc3Q=
-.
-mailbox://testpop3a@localhost
-\=username=\
-~
-*\=password=\
-~c210cHRlc3Q=
-.
-smtp://testsmtp@localhost
-\=username=\
-~
-*\=password=\
-~c210cHRlc3Q=
-.
-smtp://testsmtpa@localhost
-\=username=\
-~
-*\=password=\
-~cG9wM3Rlc3Q=
-.

mailnews/test/data/signons-mailnews1.8.txt

@@ -1,26 +0,0 @@
-#2c
-.
-mailbox://testpop3@localhost
-\=username=\
-~
-*\=password=\
-~cG9wM3Rlc3Q=
-.
-news://localhost:119/#password
-\=username=\
-~
-*\=password=\
-~bmV3c3Rlc3Q=
-.
-news://localhost:119/#username
-\=username=\
-~
-*\=password=\
-~dGVzdG5ld3M=
-.
-smtp://testsmtp@localhost
-\=username=\
-~
-*\=password=\
-~c210cHRlc3Q=
-.

mailnews/test/resources/passwordStorage.js

@@ -0,0 +1,10 @@
+if (typeof gDEPTH == "undefined")
+  do_throw("gDEPTH must be defined when using passwordStorage.js");
+
+function setupForPassword(storageName) {
+  let keyDB = do_get_file(gDEPTH + "mailnews/data/key3.db");
+  keyDB.copyTo(do_get_profile(), "key3.db");
+
+  let signons = do_get_file(gDEPTH + "mailnews/data/" + storageName);
+  signons.copyTo(do_get_profile(), "signons.sqlite");
+}