зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1449255: Part 23 - Remove test_bug587088.js, which has been disabled for a long time. r=aswan
MozReview-Commit-ID: K6uwZfbw6ta --HG-- extra : rebase_source : 6bd732e7ebf961156a1520dfcc5a599ee15d02f0
This commit is contained in:
Родитель
38e3f67780
Коммит
97306571ac
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
|
||||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>addon1@tests.mozilla.org</em:id>
|
||||
<em:version>1.0</em:version>
|
||||
|
||||
<!-- Front End MetaData -->
|
||||
<em:name>Bug 587088 Test</em:name>
|
||||
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<em:id>xpcshell@tests.mozilla.org</em:id>
|
||||
<em:minVersion>1</em:minVersion>
|
||||
<em:maxVersion>1</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
</Description>
|
||||
</RDF>
|
|
@ -1 +0,0 @@
|
|||
Contents of add-on version 1
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
|
||||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>addon1@tests.mozilla.org</em:id>
|
||||
<em:version>2.0</em:version>
|
||||
|
||||
<!-- Front End MetaData -->
|
||||
<em:name>Bug 587088 Test</em:name>
|
||||
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<em:id>xpcshell@tests.mozilla.org</em:id>
|
||||
<em:minVersion>1</em:minVersion>
|
||||
<em:maxVersion>1</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
</Description>
|
||||
</RDF>
|
|
@ -1 +0,0 @@
|
|||
Contents of add-on version 2
|
|
@ -8,17 +8,50 @@
|
|||
const profileDir = gProfD.clone();
|
||||
profileDir.append("extensions");
|
||||
|
||||
function run_test() {
|
||||
const ADDONS = [
|
||||
{
|
||||
"install.rdf": {
|
||||
"id": "addon1@tests.mozilla.org",
|
||||
"version": "1.0",
|
||||
"name": "Bug 587088 Test",
|
||||
"targetApplications": [
|
||||
{
|
||||
"id": "xpcshell@tests.mozilla.org",
|
||||
"minVersion": "1",
|
||||
"maxVersion": "1"
|
||||
}
|
||||
]
|
||||
},
|
||||
"testfile": "",
|
||||
"testfile1": "",
|
||||
},
|
||||
|
||||
{
|
||||
"install.rdf": {
|
||||
"id": "addon1@tests.mozilla.org",
|
||||
"version": "2.0",
|
||||
"name": "Bug 587088 Test",
|
||||
"targetApplications": [
|
||||
{
|
||||
"id": "xpcshell@tests.mozilla.org",
|
||||
"minVersion": "1",
|
||||
"maxVersion": "1"
|
||||
}
|
||||
]
|
||||
},
|
||||
"testfile": "",
|
||||
"testfile2": "",
|
||||
},
|
||||
];
|
||||
|
||||
add_task(async function setup() {
|
||||
// This is only an issue on windows.
|
||||
if (!("nsIWindowsRegKey" in Ci))
|
||||
return;
|
||||
|
||||
do_test_pending();
|
||||
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
|
||||
|
||||
startupManager();
|
||||
run_test_1();
|
||||
}
|
||||
});
|
||||
|
||||
function check_addon(aAddon, aVersion) {
|
||||
Assert.notEqual(aAddon, null);
|
||||
|
@ -72,11 +105,12 @@ function check_addon_uninstalling(aAddon, aAfterRestart) {
|
|||
Assert.equal(aAddon.pendingOperations, AddonManager.PENDING_UNINSTALL);
|
||||
}
|
||||
|
||||
function run_test_1() {
|
||||
installAllFiles([do_get_addon("test_bug587088_1")], function() {
|
||||
restartManager();
|
||||
add_task(async function test_1() {
|
||||
await AddonTestUtils.promiseInstallXPI(ADDONS[0]);
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
|
||||
await promiseRestartManager();
|
||||
|
||||
let a1 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon(a1, "1.0");
|
||||
|
||||
// Lock either install.rdf for unpacked add-ons or the xpi for packed add-ons.
|
||||
|
@ -88,45 +122,38 @@ function run_test_1() {
|
|||
createInstance(Ci.nsIFileInputStream);
|
||||
fstream.init(uri.QueryInterface(Ci.nsIFileURL).file, -1, 0, 0);
|
||||
|
||||
installAllFiles([do_get_addon("test_bug587088_2")], function() {
|
||||
await AddonTestUtils.promiseInstallXPI(ADDONS[1]);
|
||||
|
||||
check_addon_upgrading(a1);
|
||||
|
||||
restartManager();
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(function(a1_2) {
|
||||
let a1_2 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon_upgrading(a1_2);
|
||||
|
||||
restartManager();
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(function(a1_3) {
|
||||
let a1_3 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon_upgrading(a1_3);
|
||||
|
||||
fstream.close();
|
||||
|
||||
restartManager();
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1_4) {
|
||||
let a1_4 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon(a1_4, "2.0");
|
||||
|
||||
a1_4.uninstall();
|
||||
executeSoon(run_test_2);
|
||||
});
|
||||
}));
|
||||
}));
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Test that a failed uninstall gets rolled back
|
||||
function run_test_2() {
|
||||
restartManager();
|
||||
|
||||
installAllFiles([do_get_addon("test_bug587088_1")], async function() {
|
||||
add_task(async function test_2() {
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(async function(a1) {
|
||||
await AddonTestUtils.promiseInstallXPI(ADDONS[0]);
|
||||
await promiseRestartManager();
|
||||
|
||||
let a1 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon(a1, "1.0");
|
||||
|
||||
// Lock either install.rdf for unpacked add-ons or the xpi for packed add-ons.
|
||||
|
@ -144,29 +171,22 @@ function run_test_2() {
|
|||
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(async function(a1_2) {
|
||||
let a1_2 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon_uninstalling(a1_2, true);
|
||||
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(async function(a1_3) {
|
||||
let a1_3 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
check_addon_uninstalling(a1_3, true);
|
||||
|
||||
fstream.close();
|
||||
|
||||
await promiseRestartManager();
|
||||
|
||||
AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1_4) {
|
||||
let a1_4 = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
|
||||
Assert.equal(a1_4, null);
|
||||
var dir = profileDir.clone();
|
||||
dir.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
|
||||
Assert.ok(!dir.exists());
|
||||
Assert.ok(!isExtensionInAddonsList(profileDir, "addon1@tests.mozilla.org"));
|
||||
|
||||
executeSoon(do_test_finished);
|
||||
});
|
||||
}));
|
||||
}));
|
||||
}));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
@ -79,8 +79,6 @@ skip-if = true # Bug 1358846 Bug 1365021 Bug 676992
|
|||
[test_bug1180901_2.js]
|
||||
skip-if = os != "win"
|
||||
[test_bug566626.js]
|
||||
[test_bug587088.js]
|
||||
skip-if = os == "win" # Bug 1358846
|
||||
[test_bug595081.js]
|
||||
[test_bug596607.js]
|
||||
[test_cache_certdb.js]
|
||||
|
|
Загрузка…
Ссылка в новой задаче