Bug 1384381 - Intermittent failures in browser_privatebrowsing_placestitle.js and browser_privatebrowsing_placesTitleNoUpdate.js. r=standard8, a=test-only
authorMarco Bonardo <mbonardo@mozilla.com>
Tue, 29 Aug 2017 18:45:36 +0200
changeset 421484 910cb02453eadbf4a5a072d322d406e600266abe
parent 421483 8a2ac486ae2497c16500d6f63bfb588fab212299
child 421485 87d6a25221a73ab79a41e105f5405fd89d91bb57
push id7693
push userryanvm@gmail.com
push dateWed, 30 Aug 2017 14:59:01 +0000
treeherdermozilla-beta@234a1abc97dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8, test-only
bugs1384381
milestone56.0
Bug 1384381 - Intermittent failures in browser_privatebrowsing_placestitle.js and browser_privatebrowsing_placesTitleNoUpdate.js. r=standard8, a=test-only MozReview-Commit-ID: 8nvln9OLx9S
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
@@ -16,30 +16,31 @@ add_task(async function test() {
   let promiseTitleChanged = PlacesTestUtils.waitForNotification(
     "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
   registerCleanupFunction(async () => {
     await BrowserTestUtils.removeTab(tab);
   });
   info("Wait for a title change notification.");
   await promiseTitleChanged;
-  is((await PlacesUtils.history.fetch(TEST_URL)).title, TITLE_1,
-     "The title matches the orignal title after first visit");
+  await BrowserTestUtils.waitForCondition(async function() {
+    return (await PlacesUtils.history.fetch(TEST_URL)).title == TITLE_1;
+  }, "The title matches the orignal title after first visit");
 
   promiseTitleChanged = PlacesTestUtils.waitForNotification(
     "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
   await PlacesTestUtils.addVisits({ uri: TEST_URL, title: TITLE_2 });
   info("Wait for a title change notification.");
   await promiseTitleChanged;
-  is((await PlacesUtils.history.fetch(TEST_URL)).title, TITLE_2,
-     "The title matches the orignal title after updating visit");
+  await BrowserTestUtils.waitForCondition(async function() {
+    return (await PlacesUtils.history.fetch(TEST_URL)).title == TITLE_2;
+  }, "The title matches the orignal title after updating visit");
 
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({private: true});
   registerCleanupFunction(async () => {
     await BrowserTestUtils.closeWindow(privateWin);
   });
   await BrowserTestUtils.openNewForegroundTab(privateWin.gBrowser, TEST_URL);
   // Wait long enough to be sure history didn't set a title.
   await new Promise(resolve => setTimeout(resolve, 1000));
   is((await PlacesUtils.history.fetch(TEST_URL)).title, TITLE_2,
      "The title remains the same after visiting in private window");
 });
-
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placestitle.js
@@ -24,34 +24,37 @@ add_task(async function test() {
   registerCleanupFunction(async () => {
     await BrowserTestUtils.closeWindow(win);
   });
 
   let promiseTitleChanged = PlacesTestUtils.waitForNotification(
     "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
   await BrowserTestUtils.openNewForegroundTab(win.gBrowser, TEST_URL);
   await promiseTitleChanged;
-  is((await PlacesUtils.history.fetch(TEST_URL)).title, "No Cookie",
-     "The page should be loaded without any cookie for the first time");
+  await BrowserTestUtils.waitForCondition(async function() {
+    return (await PlacesUtils.history.fetch(TEST_URL)).title == "No Cookie";
+  }, "The page should be loaded without any cookie for the first time");
 
   promiseTitleChanged = PlacesTestUtils.waitForNotification(
     "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
   await BrowserTestUtils.openNewForegroundTab(win.gBrowser, TEST_URL);
   await promiseTitleChanged;
-  is((await PlacesUtils.history.fetch(TEST_URL)).title, "Cookie",
-     "The page should be loaded with a cookie for the second time");
+  await BrowserTestUtils.waitForCondition(async function() {
+    return (await PlacesUtils.history.fetch(TEST_URL)).title == "Cookie";
+  }, "The page should be loaded with a cookie for the second time");
 
   await cleanup();
 
   promiseTitleChanged = PlacesTestUtils.waitForNotification(
     "onTitleChanged", (uri, title) => uri.spec == TEST_URL, "history");
   await BrowserTestUtils.openNewForegroundTab(win.gBrowser, TEST_URL);
   await promiseTitleChanged;
-  is((await PlacesUtils.history.fetch(TEST_URL)).title, "No Cookie",
-     "The page should be loaded without any cookie again");
+  await BrowserTestUtils.waitForCondition(async function() {
+    return (await PlacesUtils.history.fetch(TEST_URL)).title == "No Cookie";
+  }, "The page should be loaded without any cookie again");
 
   // Reopen the page in a private browser window, it should not notify a title
   // change.
   let win2 = await BrowserTestUtils.openNewBrowserWindow({private: true});
   registerCleanupFunction(async () => {
     let promisePBExit = TestUtils.topicObserved("last-pb-context-exited");
     await BrowserTestUtils.closeWindow(win2);
     await promisePBExit;