Fix a merge failure in the test from bug 581229.
authorDave Townsend <dtownsend@oxymoronical.com>
Fri, 30 Jul 2010 08:36:35 -0700
changeset 48418 6f99979d11bff57995ffcca89e48fdd7d0d3ddd1
parent 48417 01877f113dab5a9f53101bbf33e9372de081d19d
child 48419 d9717604f00747b870c99050fb78b5ede29d7a0f
push id14722
push userdtownsend@mozilla.com
push dateFri, 30 Jul 2010 15:36:40 +0000
treeherdermozilla-central@6f99979d11bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs581229
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix a merge failure in the test from bug 581229.
browser/base/content/test/browser_bug553455.js
--- a/browser/base/content/test/browser_bug553455.js
+++ b/browser/base/content/test/browser_bug553455.js
@@ -350,34 +350,17 @@ function test_wronghost() {
          "because it appears to be corrupt.",
          "Should have seen the right message");
 
       gBrowser.removeTab(gBrowser.selectedTab);
       runNextTest();
     });
   }, true);
   gBrowser.loadURI(TESTROOT2 + "enabled.html");
-}
-];
-
-function runNextTest() {
-  AddonManager.getAllInstalls(function(aInstalls) {
-    is(aInstalls.length, 0, "Should be no active installs");
-
-    if (TESTS.length == 0) {
-      Services.prefs.setBoolPref("extensions.logging.enabled", false);
-
-      finish();
-      return;
-    }
-
-    info("Running " + TESTS[0].name);
-    TESTS.shift()();
-  });
-};
+},
 
 function test_reload() {
   var pm = Services.perms;
   pm.add(makeURI("http://example.com/"), "install", pm.ALLOW_ACTION);
 
   var triggers = encodeURIComponent(JSON.stringify({
     "Unsigned XPI": "unsigned.xpi"
   }));
@@ -419,16 +402,33 @@ function test_reload() {
           Services.perms.remove("example.com", "install");
           runNextTest();
         });
       }, true);
       gBrowser.loadURI(TESTROOT2 + "enabled.html");
     });
   });
 }
+];
+
+function runNextTest() {
+  AddonManager.getAllInstalls(function(aInstalls) {
+    is(aInstalls.length, 0, "Should be no active installs");
+
+    if (TESTS.length == 0) {
+      Services.prefs.setBoolPref("extensions.logging.enabled", false);
+
+      finish();
+      return;
+    }
+
+    info("Running " + TESTS[0].name);
+    TESTS.shift()();
+  });
+};
 
 function test() {
   waitForExplicitFinish();
 
   Services.prefs.setBoolPref("extensions.logging.enabled", true);
 
   runNextTest();
 }