Bug 607133 - Remove the unneeded bits of test_404630.js which hit the network, and thus make it flaky, r=mak, a=orange
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 30 Nov 2010 08:03:42 -0800
changeset 58617 1f2beffd84ff6e63451e0120c5b59bc88e95b9e5
parent 58616 c5e63ee001324785bbeab8a1422e9650c8c15911
child 58619 ae74a11a7d98f3c82582e2519ac774979127322e
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersmak, orange
bugs607133
milestone2.0b8pre
Bug 607133 - Remove the unneeded bits of test_404630.js which hit the network, and thus make it flaky, r=mak, a=orange
toolkit/components/places/tests/unit/test_404630.js
--- a/toolkit/components/places/tests/unit/test_404630.js
+++ b/toolkit/components/places/tests/unit/test_404630.js
@@ -32,18 +32,16 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 function run_test() {
-  do_test_pending();
-
   let exceptionCaught = false;
   try {
     PlacesUtils.favicons.setAndLoadFaviconForPage(
       null, uri("http://www.mozilla.com/favicon.ico"), false
     );
   } catch (ex) {
     exceptionCaught = true;
   }
@@ -54,18 +52,9 @@ function run_test() {
     PlacesUtils.favicons.setAndLoadFaviconForPage(
       uri("http://www.mozilla.com"), null, false
     );
     do_throw("should throw because favicon param is null");
   } catch (ex) {
     exceptionCaught = true;
   }
   do_check_true(exceptionCaught, "should throw because page param is null");
-
-  PlacesUtils.favicons.setAndLoadFaviconForPage(
-    uri("http://www.google.com"), uri("http://www.google.com/favicon.ico"),
-    false, continue_test
-  );
 }
-
-function continue_test(aFaviconData) {
-  do_test_finished();
-}