Bug 615954 - Intermittent Failure in tabview/browser_tabview_bug597248.js | Tab item is showing cached data and is already connected or | Tab item is not showing cached data anymore try: -b do -p all -u mochitest-o -m none -t none r=ian, a=test orange

--HG--
extra : rebase_source : ccf70a980b110c5dd80e083e2716722f2e66f8ab

browser/base/content/test/tabview/browser_tabview_bug597248.js

@@ -100,22 +100,30 @@ function setupTwo() {
           restoredWin.removeEventListener(
             "tabviewframeinitialized", onTabViewFrameInitialized, false);
 
+          /*
+          // bug 615954 happens too often so we disable this until we have a fix
           let restoredContentWindow = 
             restoredWin.document.getElementById("tab-view").contentWindow;
           // prevent TabItems._update being called before checking cached images
           restoredContentWindow.TabItems._pauseUpdateForTest = true;
+          */
+          restoredWin.close();
+          finish();
         }
         restoredWin.addEventListener(
           "tabviewframeinitialized", onTabViewFrameInitialized, false);
 
-        restoredWin.addEventListener("tabviewshown", onTabViewShown, false);
-        
         is(restoredWin.gBrowser.tabs.length, 2, "The total number of tabs is 2");
 
+        /*
+        // bug 615954 happens too often so we disable this until we have a fix
+        restoredWin.addEventListener("tabviewshown", onTabViewShown, false);
+
         // setup tab variables and listen to the load progress.
         newTabOne = restoredWin.gBrowser.tabs[0];
         newTabTwo = restoredWin.gBrowser.tabs[1];
         restoredWin.gBrowser.addTabsProgressListener(gTabsProgressListener);
+        */
       }, false);
     });
   };