Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 60 deletions

diff --git a/toolkit/components/satchel/test/unit/test_db_update_v4.js b/toolkit/components/satchel/test/unit/test_db_update_v4.js
deleted file mode 100644
index 84b17e8a0..000000000
--- a/toolkit/components/satchel/test/unit/test_db_update_v4.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var testnum = 0;
-
-var iter;
-
-function run_test()
-{
-  do_test_pending();
-  iter = next_test();
-  iter.next();
-}
-
-function* next_test()
-{
-  try {
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_v3.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_eq(3, getDBVersion(testfile));
-
-  // ===== 1 =====
-  testnum++;
-
-  destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  let dbConnection = Services.storage.openUnsharedDatabase(destFile);
-
-  // check for upgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // Check that the index was added
-  do_check_true(dbConnection.tableExists("moz_deleted_formhistory"));
-  dbConnection.close();
-
-  // check for upgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-  // check that an entry still exists
-  yield countEntries("name-A", "value-A",
-    function (num) {
-      do_check_true(num > 0);
-      do_test_finished();
-    }
-  );
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-}