Bug 1447903: Part 18b - Fold test_bug425657 into test_bug397778.js. r=aswan

MozReview-Commit-ID: LrsRe47g0hy

--HG--
extra : rebase_source : 7355b27871c312ca1fba62185a76b4711b289564

toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf

@@ -1,17 +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>bug425657@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>1</em:minVersion>
-        <em:maxVersion>1</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    <em:name>Deutsches Wörterbuch</em:name>
-  </Description>
-</RDF>

toolkit/mozapps/extensions/test/xpcshell/head_addons.js

@@ -76,7 +76,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
 // Whitelist existing tests that still use non-restartless extensions.
 const LEGACY_NON_RESTARTLESS_TESTS = new Set([
   "test_blocklistchange.js",
-  "test_bug425657.js",
   "test_bug455906.js",
 ]);
 

toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js

@@ -25,7 +25,7 @@ const ADDON = {
     },
     {
       locale: ["de-DE"],
-      name: "de-DE Name",
+      name: "Deutsches W\u00f6rterbuch",
     },
     {
       locale: ["es-ES"],
@@ -103,7 +103,7 @@ function run_test_2() {
 
   AddonManager.getAddonByID(ID, function(addon) {
     Assert.notEqual(addon, null);
-    Assert.equal(addon.name, "de-DE Name");
+    Assert.equal(addon.name, "Deutsches W\u00f6rterbuch");
     Assert.equal(addon.description, null);
 
     executeSoon(run_test_3);
@@ -117,7 +117,7 @@ function run_test_3() {
 
   AddonManager.getAddonByID(ID, function(addon) {
     Assert.notEqual(addon, null);
-    Assert.equal(addon.name, "de-DE Name");
+    Assert.equal(addon.name, "Deutsches W\u00f6rterbuch");
     Assert.equal(addon.description, null);
 
     executeSoon(run_test_4);

toolkit/mozapps/extensions/test/xpcshell/test_bug425657.js

@@ -1,26 +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/.
- */
-
-const ADDON = "test_bug425657";
-const ID = "bug425657@tests.mozilla.org";
-
-function run_test() {
-  // Setup for test
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
-
-  // Install test add-on
-  startupManager();
-  installAllFiles([do_get_addon(ADDON)], function() {
-    restartManager();
-    AddonManager.getAddonByID(ID, function(addon) {
-      Assert.notEqual(addon, null);
-      Assert.equal(addon.name, "Deutsches W\u00f6rterbuch");
-      Assert.equal(addon.name.length, 20);
-
-      executeSoon(do_test_finished);
-    });
-  });
-}

toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini

@@ -114,9 +114,6 @@ skip-if = os == "android"
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 tags = blocklist
-[test_bug425657.js]
-# Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
 [test_bug430120.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"