Bug 906713 - reset default capture timeout earlier to prevent oranges. r=adw
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 09 Sep 2013 10:16:21 +1000
changeset 146130 e89edb607559cd9cd0ae32e5fb24f0791ca02c96
parent 146129 84caf75159b2505779228b0dc71bd3de1b915f1f
child 146131 b152bdd937ebdcd13b77bd4308e14ebf86093c05
push id25242
push useremorley@mozilla.com
push dateMon, 09 Sep 2013 12:13:52 +0000
treeherdermozilla-central@218d4334d29e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersadw
bugs906713
milestone26.0a1
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
Bug 906713 - reset default capture timeout earlier to prevent oranges. r=adw
toolkit/components/thumbnails/test/browser_thumbnails_background.js
--- a/toolkit/components/thumbnails/test/browser_thumbnails_background.js
+++ b/toolkit/components/thumbnails/test/browser_thumbnails_background.js
@@ -135,22 +135,22 @@ let tests = [
 
     yield capture(url1);
     ok(file1.exists(), "First file should exist after capture.");
     file1.remove(false);
 
     yield wait(2000);
     is(imports.BackgroundPageThumbs._thumbBrowser, undefined,
        "Thumb browser should be destroyed after timeout.");
+    imports.BackgroundPageThumbs._destroyBrowserTimeout = defaultTimeout;
 
     yield capture(url2);
     ok(file2.exists(), "Second file should exist after capture.");
     file2.remove(false);
 
-    imports.BackgroundPageThumbs._destroyBrowserTimeout = defaultTimeout;
     isnot(imports.BackgroundPageThumbs._thumbBrowser, undefined,
           "Thumb browser should exist immediately after capture.");
   },
 
   function privateBrowsingActive() {
     let url = "http://example.com/";
     let file = fileForURL(url);
     ok(!file.exists(), "Thumbnail file should not already exist.");