diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm index 4bb31f51558f..a48a2549ef01 100644 --- a/browser/components/migration/MigrationUtils.jsm +++ b/browser/components/migration/MigrationUtils.jsm @@ -35,8 +35,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "setTimeout", - "resource://gre/modules/Timer.jsm"); var gMigrators = null; var gProfileStartup = null; diff --git a/browser/components/migration/tests/unit/test_MigrationUtils_timedRetry.js b/browser/components/migration/tests/unit/test_MigrationUtils_timedRetry.js deleted file mode 100644 index d55528d02597..000000000000 --- a/browser/components/migration/tests/unit/test_MigrationUtils_timedRetry.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict"; - -XPCOMUtils.defineLazyModuleGetter(this, "OS", - "resource://gre/modules/osfile.jsm"); - -let tmpFile = FileUtils.getDir("TmpD", [], true); -let dbConn; - -add_task(async function setup() { - tmpFile.append("TestDB"); - dbConn = await Sqlite.openConnection({ path: tmpFile.path }); - - do_register_cleanup(() => { - dbConn.close(); - OS.File.remove(tmpFile.path); - }); -}); - -add_task(async function testgetRowsFromDBWithoutLocksRetries() { - let promise = MigrationUtils.getRowsFromDBWithoutLocks(tmpFile.path, - "Temp DB", - "SELECT * FROM moz_temp_table") - await new Promise(resolve => do_timeout(50, resolve)); - dbConn.execute("CREATE TABLE moz_temp_table (id INTEGER PRIMARY KEY)"); - await promise; -}); diff --git a/browser/components/migration/tests/unit/xpcshell.ini b/browser/components/migration/tests/unit/xpcshell.ini index 4fc70386220b..67ee7c1db5d3 100644 --- a/browser/components/migration/tests/unit/xpcshell.ini +++ b/browser/components/migration/tests/unit/xpcshell.ini @@ -23,6 +23,5 @@ skip-if = !(os == "win" && bits == 64) # bug 1392396 skip-if = os != "win" [test_IE7_passwords.js] skip-if = os != "win" -[test_MigrationUtils_timedRetry.js] [test_Safari_bookmarks.js] skip-if = os != "mac"