author | Wolfgang Rosenauer <wr@rosenauer.org> |
Fri, 11 Jan 2013 10:10:04 +0100 | |
branch | firefox18 |
changeset 602 | bd89d2f9ea1d |
permissions | -rw-r--r-- |
602
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# Parent 297b3a7802b2488cca8f2e6febc77e9dbf7f16e0 |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Bug 818468 - Langpacks bundled in distribution/extensions are registered but disabled even if shown enabled |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
(backing out Bug 677092 - Make language packs restartless by default) |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
--- a/toolkit/mozapps/extensions/XPIProvider.jsm |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
@@ -757,18 +757,18 @@ function loadManifestFromRDF(aUri, aStre |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
if (addon.optionsType && |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
addon.optionsType != AddonManager.OPTIONS_TYPE_DIALOG && |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
addon.optionsType != AddonManager.OPTIONS_TYPE_INLINE && |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
addon.optionsType != AddonManager.OPTIONS_TYPE_TAB) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
throw new Error("Install manifest specifies unknown type: " + addon.optionsType); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
else { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
- // spell check dictionaries and language packs never require a restart |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
- if (addon.type == "dictionary" || addon.type == "locale") |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+ // spell check dictionaries never require a restart |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+ if (addon.type == "dictionary") |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
addon.bootstrap = true; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
// Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
// all other types they are silently ignored |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
addon.optionsURL = null; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
addon.optionsType = null; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
addon.aboutURL = null; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
@@ -3712,21 +3712,16 @@ var XPIProvider = { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
// Never call any bootstrap methods in safe mode |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
if (Services.appinfo.inSafeMode) |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
return; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
if (aMethod == "startup") |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
Components.manager.addBootstrappedManifestLocation(aFile); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
try { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
- // Don't call bootstrap.js methods for language packs, |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
- // they only contain chrome. |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
- if (aType == "locale") |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
- return; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
// Load the scope if it hasn't already been loaded |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
if (!(aId in this.bootstrapScopes)) |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
this.loadBootstrapScope(aId, aFile, aVersion, aType); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
if (!(aMethod in this.bootstrapScopes[aId])) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
WARN("Add-on " + aId + " is missing bootstrap method " + aMethod); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
return; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
@@ -4,19 +4,16 @@ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
// This verifies that bootstrappable add-ons can be used without restarts. |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
Components.utils.import("resource://gre/modules/Services.jsm"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
// Enable loading extensions from the user scopes |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
Services.prefs.setIntPref("extensions.enabledScopes", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
-// The test extension uses an insecure update url. |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
-Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
const profileDir = gProfD.clone(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
profileDir.append("extensions"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
const userExtDir = gProfD.clone(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
userExtDir.append("extensions2"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
userExtDir.append(gAppInfo.ID); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
registerDirectory("XREUSysExt", userExtDir.parent); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
@@ -98,17 +95,16 @@ var HunspellEngine = { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
}; |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
function run_test() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
do_test_pending(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
// Create and configure the HTTP server. |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
testserver = new HttpServer(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
- testserver.registerDirectory("/data/", do_get_file("data")); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
testserver.registerDirectory("/addons/", do_get_file("addons")); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
testserver.start(4444); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
startupManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
run_test_1(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
@@ -563,17 +559,17 @@ function check_test_23() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
AddonManager.getAddonsWithOperationsByTypes(null, function(list) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
do_check_eq(list.length, 0); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
b1.uninstall(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
- run_test_25(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
+ testserver.stop(run_test_25); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
// Tests that updating from a bootstrappable add-on to a normal add-on calls |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
// the uninstall method |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
@@ -631,160 +627,15 @@ function run_test_26() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
do_check_neq(b1, null); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
do_check_eq(b1.version, "1.0"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
do_check_true(b1.isActive); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
119 |
do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
HunspellEngine.deactivate(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
- b1.uninstall(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
124 |
- run_test_27(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
125 |
+ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
126 |
+ do_test_finished(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
128 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
}); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
130 |
} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
|
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
-// Tests that an update check from a normal add-on to a bootstrappable add-on works |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
-function run_test_27() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
- writeInstallRDFForExtension({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
- id: "ab-CD@dictionaries.addons.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
- version: "1.0", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
- updateURL: "http://localhost:4444/data/test_dictionary.rdf", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
- targetApplications: [{ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
- id: "xpcshell@tests.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
140 |
- minVersion: "1", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
- maxVersion: "1" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
- }], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
- name: "Test Dictionary", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
- }, profileDir); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
- prepare_test({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
- "ab-CD@dictionaries.addons.mozilla.org": [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
- "onInstalling" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
- ] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
151 |
- }, [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
152 |
- "onNewInstall", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
153 |
- "onDownloadStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
- "onDownloadEnded", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
- "onInstallStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
- "onInstallEnded" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
157 |
- ], check_test_27); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
158 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
159 |
- AddonManagerPrivate.backgroundUpdateCheck(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
160 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
161 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
162 |
-function check_test_27(install) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
163 |
- do_check_eq(install.existingAddon.pendingUpgrade.install, install); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
164 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
165 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
166 |
- AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
167 |
- do_check_neq(b1, null); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
168 |
- do_check_eq(b1.version, "2.0"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
169 |
- do_check_eq(b1.type, "dictionary"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
170 |
- b1.uninstall(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
- run_test_28(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
174 |
- }); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
175 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
176 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
177 |
-// Tests that an update check from a bootstrappable add-on to a normal add-on works |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
178 |
-function run_test_28() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
179 |
- writeInstallRDFForExtension({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
180 |
- id: "ef@dictionaries.addons.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
181 |
- version: "1.0", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
182 |
- type: "64", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
183 |
- updateURL: "http://localhost:4444/data/test_dictionary.rdf", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
- targetApplications: [{ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
- id: "xpcshell@tests.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
- minVersion: "1", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
187 |
- maxVersion: "1" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
- }], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
- name: "Test Dictionary ef", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
- }, profileDir); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
192 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
- prepare_test({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
- "ef@dictionaries.addons.mozilla.org": [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
- "onInstalling" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
- ] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
- }, [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
- "onNewInstall", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
199 |
- "onDownloadStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
200 |
- "onDownloadEnded", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
201 |
- "onInstallStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
- "onInstallEnded" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
203 |
- ], check_test_28); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
- AddonManagerPrivate.backgroundUpdateCheck(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
-function check_test_28(install) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
- do_check_eq(install.existingAddon.pendingUpgrade.install, install); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
212 |
- AddonManager.getAddonByID("ef@dictionaries.addons.mozilla.org", function(b2) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
213 |
- do_check_neq(b2, null); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
214 |
- do_check_eq(b2.version, "2.0"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
- do_check_eq(b2.type, "extension"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
216 |
- b2.uninstall(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
218 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
219 |
- run_test_29(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
- }); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
221 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
-// Tests that an update check from a bootstrappable add-on to a bootstrappable add-on works |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
-function run_test_29() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
- writeInstallRDFForExtension({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
226 |
- id: "gh@dictionaries.addons.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
- version: "1.0", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
- type: "64", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
229 |
- updateURL: "http://localhost:4444/data/test_dictionary.rdf", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
- targetApplications: [{ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
231 |
- id: "xpcshell@tests.mozilla.org", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
232 |
- minVersion: "1", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
233 |
- maxVersion: "1" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
234 |
- }], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
235 |
- name: "Test Dictionary gh", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
236 |
- }, profileDir); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
237 |
- restartManager(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
238 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
- prepare_test({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
- "gh@dictionaries.addons.mozilla.org": [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
- ["onInstalling", false /* = no restart */], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
- ["onInstalled", false] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
- ] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
- }, [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
- "onNewInstall", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
- "onDownloadStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
- "onDownloadEnded", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
- "onInstallStarted", |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
- "onInstallEnded" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
250 |
- ], check_test_29); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
251 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
252 |
- AddonManagerPrivate.backgroundUpdateCheck(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
253 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
254 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
255 |
-function check_test_29(install) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
256 |
- AddonManager.getAddonByID("gh@dictionaries.addons.mozilla.org", function(b2) { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
257 |
- do_check_neq(b2, null); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
258 |
- do_check_eq(b2.version, "2.0"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
259 |
- do_check_eq(b2.type, "dictionary"); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
- prepare_test({ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
262 |
- "gh@dictionaries.addons.mozilla.org": [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
- ["onUninstalling", false], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
264 |
- ["onUninstalled", false], |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
265 |
- ] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
266 |
- }, [ |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
267 |
- ], finish_test_29); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
268 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
269 |
- b2.uninstall(); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
270 |
- }); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
271 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
272 |
- |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
273 |
-function finish_test_29() { |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
274 |
- testserver.stop(do_test_finished); |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
275 |
-} |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
276 |
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
277 |
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
278 |
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
279 |
@@ -136,17 +136,16 @@ fail-if = os == "android" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
280 |
[test_cacheflush.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
281 |
[test_checkcompatibility.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
[test_ChromeManifestParser.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
283 |
[test_compatoverrides.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
[test_corrupt.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
[test_corrupt_strictcompat.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
[test_db_sanity.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
287 |
[test_dictionary.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
-[test_langpack.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
289 |
[test_disable.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
290 |
[test_distribution.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
291 |
[test_dss.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
# Bug 676992: test consistently fails on Android |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
293 |
fail-if = os == "android" |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
294 |
[test_duplicateplugins.js] |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
295 |
# Bug 676992: test consistently hangs on Android |
bd89d2f9ea1d
add mozilla-backout-677092.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
296 |
skip-if = os == "android" |