Merge autoland to mozilla-central. a=merge
authorshindli <shindli@mozilla.com>
Mon, 22 Apr 2019 18:45:34 +0300
changeset 470349 1d1471ae2e7ac6a16c3b2663ca25d4c82cc68864
parent 470348 34059c6188e54415a97125be22b06040dbcc2f93 (current diff)
parent 470347 aac1ed6850e39b12727b36be7a44bccb145e8b66 (diff)
child 470350 b4b482a09cf0f1c7f31ee8d08266108f5d07d27e
child 470357 ed50266b84e2a489c5e97cf68b98b116d6ce4501
push id112865
push usershindli@mozilla.com
push dateMon, 22 Apr 2019 15:52:44 +0000
treeherdermozilla-inbound@b4b482a09cf0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.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
Merge autoland to mozilla-central. a=merge
testing/raptor/raptor/tests/raptor-tp6-8-404.ini
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -597,17 +597,17 @@ HistoryMenu.prototype = {
     else
       this.undoTabMenu.removeAttribute("disabled");
   },
 
   /**
    * Populate when the history menu is opened
    */
   populateUndoSubmenu: function PHM_populateUndoSubmenu() {
-    var undoPopup = this.undoTabMenu.firstChild;
+    var undoPopup = this.undoTabMenu.menupopup;
 
     // remove existing menu items
     while (undoPopup.hasChildNodes())
       undoPopup.firstChild.remove();
 
     // no restorable tabs, so make sure menu is disabled, and return
     if (this._getClosedTabCount() == 0) {
       this.undoTabMenu.setAttribute("disabled", true);
@@ -630,17 +630,17 @@ HistoryMenu.prototype = {
     else
       this.undoWindowMenu.removeAttribute("disabled");
   },
 
   /**
    * Populate when the history menu is opened
    */
   populateUndoWindowSubmenu: function PHM_populateUndoWindowSubmenu() {
-    let undoPopup = this.undoWindowMenu.firstChild;
+    let undoPopup = this.undoWindowMenu.menupopup;
 
     // remove existing menu items
     while (undoPopup.hasChildNodes())
       undoPopup.firstChild.remove();
 
     // no restorable windows, so make sure menu is disabled, and return
     if (SessionStore.getClosedWindowCount() == 0) {
       this.undoWindowMenu.setAttribute("disabled", true);
--- a/browser/components/extensions/test/browser/browser_ext_sessions_restoreTab.js
+++ b/browser/components/extensions/test/browser/browser_ext_sessions_restoreTab.js
@@ -56,8 +56,61 @@ add_task(async function test_restoringMo
   is(restoredTab.linkedBrowser.currentURI.spec, contentScriptTabURL, "Got expected URL");
 
   await extension.unload();
   BrowserTestUtils.removeTab(restoredTab);
 
   // Close the window.
   await BrowserTestUtils.closeWindow(win);
 });
+
+add_task(async function test_restoringClosedTabWithTooLargeIndex() {
+  function background() {
+    browser.test.onMessage.addListener(async (msg, filter) => {
+      if (msg != "restoreTab") {
+        return;
+      }
+      const recentlyClosed = await browser.sessions.getRecentlyClosed({maxResults: 2});
+      let tabWithTooLargeIndex;
+      for (const info of recentlyClosed) {
+        if (info.tab && info.tab.index > 1) {
+          tabWithTooLargeIndex = info.tab;
+          break;
+        }
+      }
+      const onRestored = tab => {
+        browser.tabs.onCreated.removeListener(onRestored);
+        browser.test.sendMessage("restoredTab", tab);
+      };
+      browser.tabs.onCreated.addListener(onRestored);
+      browser.sessions.restore(tabWithTooLargeIndex.sessionId);
+    });
+  }
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["tabs", "sessions"],
+    },
+    background,
+  });
+
+  const win = await BrowserTestUtils.openNewBrowserWindow({});
+  const tabs = await Promise.all([
+    BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:blank?0"),
+    BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:blank?1"),
+  ]);
+  const promsiedSessionStored = Promise.all([
+    BrowserTestUtils.waitForSessionStoreUpdate(tabs[0]),
+    BrowserTestUtils.waitForSessionStoreUpdate(tabs[1]),
+  ]);
+  // Close the rightmost tab at first
+  BrowserTestUtils.removeTab(tabs[1]);
+  BrowserTestUtils.removeTab(tabs[0]);
+  await promsiedSessionStored;
+
+  await extension.startup();
+  const promisedRestoredTab = extension.awaitMessage("restoredTab");
+  extension.sendMessage("restoreTab");
+  const restoredTab = await promisedRestoredTab;
+  is(restoredTab.index, 1, "Got valid index");
+
+  await extension.unload();
+  await BrowserTestUtils.closeWindow(win);
+});
--- a/browser/components/extensions/test/browser/browser_ext_tabs_create.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
@@ -94,16 +94,20 @@ add_task(async function test_create_opti
             {
               create: {index: 1, active: false},
               result: {index: 1, active: false},
             },
             {
               create: {windowId: activeWindow},
               result: {windowId: activeWindow},
             },
+            {
+              create: {index: 9999},
+              result: {index: 2},
+            },
           ];
 
           async function nextTest() {
             if (!tests.length) {
               browser.test.notifyPass("tabs.create");
               return;
             }
 
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -71,17 +71,17 @@ skip-if = toolkit == 'android' #CRASH_DU
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug547996-2.xhtml]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug556493.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug563329.html]
 skip-if = true # Disabled due to timeouts.
 [test_bug574663.html]
-skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
+skip-if = (toolkit == 'android') || (os == 'win' && bits == 32 && !debug) || (os == 'linux' && !debug) #CRASH_DUMP, RANDOM, Bug 1523853
 [test_bug591815.html]
 [test_bug593959.html]
 [test_bug603008.html]
 skip-if = toolkit == 'android'
 [test_bug605242.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug607464.html]
 skip-if = toolkit == 'android' || e10s #CRASH_DUMP, RANDOM, bug 1400586
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -274,17 +274,17 @@ skip-if = android_version == '18' # andr
 skip-if = toolkit == 'android' # android(Bug 1189784, timeouts on 4.3 emulator), Bug 1265878
 [test_peerConnection_twoAudioStreams.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioTracksInOneStream.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioVideoStreams.html]
 skip-if = (os == 'linux' && debug && e10s) || android_version == '18' # Bug 1171255 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoAudioVideoStreamsCombined.html]
-skip-if = (os == 'linux' && debug && e10s) || toolkit == 'android' # Bug 1127828 for Linux debug e10s, android(Bug 1189784)
+skip-if = (os == 'linux' && debug && e10s) || (toolkit == 'android') || (os == 'linux' && asan) # Bug 1127828 for Linux debug e10s, android(Bug 1189784), Bug 1480942 for Linux asan
 [test_peerConnection_twoVideoStreams.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_twoVideoTracksInOneStream.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addAudioTrackToExistingVideoStream.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_addSecondAudioStream.html]
 skip-if = (android_version == '18') # emulator is too slow to finish a renegotiation test in under 5 minutes
--- a/taskcluster/ci/test/raptor-chromium.yml
+++ b/taskcluster/ci/test/raptor-chromium.yml
@@ -112,26 +112,16 @@ raptor-tp6-8-chromium:
     description: "Raptor tp6-8 on Chromium"
     try-name: raptor-tp6-8-chromium
     treeherder-symbol: Rap-Cr(tp6-8)
     mozharness:
         extra-options:
             - --test=raptor-tp6-8
             - --app=chromium
 
-raptor-tp6-8-404-chromium:
-    description: "Raptor tp6-8-404 on Chromium"
-    try-name: raptor-tp6-8-404-chromium
-    treeherder-symbol: Rap-Cr(tp6-8-404)
-    tier: 3
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6-8-404
-            - --app=chromium
-
 raptor-tp6-9-chromium:
     description: "Raptor tp6-9 on Chromium"
     try-name: raptor-tp6-9-chromium
     treeherder-symbol: Rap-Cr(tp6-9)
     mozharness:
         extra-options:
             - --test=raptor-tp6-9
             - --app=chromium
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -189,34 +189,20 @@ raptor-tp6-7-firefox-profiling:
             - --test=raptor-tp6-7
             - --gecko-profile
 
 raptor-tp6-8-firefox:
     description: "Raptor tp6-8 on Firefox"
     try-name: raptor-tp6-8-firefox
     treeherder-symbol: Rap(tp6-8)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-8
 
-raptor-tp6-8-404-firefox:
-    description: "Raptor tp6-8-404 on Firefox"
-    try-name: raptor-tp6-8-404-firefox
-    treeherder-symbol: Rap(tp6-8-404)
-    run-on-projects:
-        by-test-platform:
-            .*shippable(?:-qr)?/opt: built-projects
-            default: ['try', 'mozilla-central']
-    tier: 3
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6-8-404
-
 raptor-tp6-8-firefox-profiling:
     description: "Raptor tp6-8 on Firefox with Gecko Profiling"
     try-name: raptor-tp6-8-firefox-profiling
     treeherder-symbol: Rap-Prof(tp6-8)
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 900
     tier: 2
     mozharness:
@@ -224,17 +210,16 @@ raptor-tp6-8-firefox-profiling:
             - --test=raptor-tp6-8
             - --gecko-profile
 
 raptor-tp6-9-firefox:
     description: "Raptor tp6-9 on Firefox"
     try-name: raptor-tp6-9-firefox
     treeherder-symbol: Rap(tp6-9)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-9
 
 raptor-tp6-9-firefox-profiling:
     description: "Raptor tp6-9 on Firefox with Gecko Profiling"
     try-name: raptor-tp6-9-firefox-profiling
     treeherder-symbol: Rap-Prof(tp6-9)
@@ -246,17 +231,16 @@ raptor-tp6-9-firefox-profiling:
             - --test=raptor-tp6-9
             - --gecko-profile
 
 raptor-tp6-10-firefox:
     description: "Raptor tp6-10 on Firefox"
     try-name: raptor-tp6-10-firefox
     treeherder-symbol: Rap(tp6-10)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-10
 
 raptor-tp6-10-firefox-profiling:
     description: "Raptor tp6-10 on Firefox with Gecko Profiling"
     try-name: raptor-tp6-10-firefox-profiling
     treeherder-symbol: Rap-Prof(tp6-10)
@@ -268,17 +252,16 @@ raptor-tp6-10-firefox-profiling:
             - --test=raptor-tp6-10
             - --gecko-profile
 
 raptor-tp6-binast-1-firefox:
     description: "Raptor tp6-binast-1 on Firefox"
     try-name: raptor-tp6-binast-1
     treeherder-symbol: Rap(tp6-b-1)
     run-on-projects: ['try', 'mozilla-central']
-    tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-binast-1
 
 raptor-tp6m-1-geckoview:
     description: "Raptor tp6m-1 on Geckoview"
     try-name: raptor-tp6m-1-geckoview
     treeherder-symbol: Rap(tp6m-1)
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -83,17 +83,16 @@ raptor-firefox:
     - raptor-tp6-1-firefox
     - raptor-tp6-2-firefox
     - raptor-tp6-3-firefox
     - raptor-tp6-4-firefox
     - raptor-tp6-5-firefox
     - raptor-tp6-6-firefox
     - raptor-tp6-7-firefox
     - raptor-tp6-8-firefox
-    - raptor-tp6-8-404-firefox
     - raptor-tp6-9-firefox
     - raptor-tp6-10-firefox
     - raptor-tp6-binast-1-firefox
     - raptor-speedometer-firefox
     - raptor-stylebench-firefox
     - raptor-motionmark-htmlsuite-firefox
     - raptor-motionmark-animometer-firefox
     - raptor-webaudio-firefox
@@ -123,17 +122,16 @@ raptor-chromium:
     - raptor-tp6-1-chromium
     - raptor-tp6-2-chromium
     - raptor-tp6-3-chromium
     - raptor-tp6-4-chromium
     - raptor-tp6-5-chromium
     - raptor-tp6-6-chromium
     - raptor-tp6-7-chromium
     - raptor-tp6-8-chromium
-    - raptor-tp6-8-404-chromium
     - raptor-tp6-9-chromium
     - raptor-tp6-10-chromium
     - raptor-speedometer-chromium
     - raptor-stylebench-chromium
     - raptor-motionmark-htmlsuite-chromium
     - raptor-motionmark-animometer-chromium
     - raptor-webaudio-chromium
     - raptor-sunspider-chromium
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
+++ b/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
@@ -1,10 +1,10 @@
 [
   {
-    "size": 6730120,
+    "size": 971729,
     "visibility": "public",
-    "digest": "c336c070497506cd13bfefd1c2fc8324c5a2f60e9088fc593a71bfd8f0d59743fcc8bd3dbb2df7ac219cd99b6b335c4cfc920404bc438d4470c264f360b5474d",
+    "digest": "75d4bdb1315de4aafe0412ece7cb8dc6766587a5aa8e1567b136d603d0dc41ad5bf9ced5a699a5f7e5149af66065fcf501c22cc60a84d8fedcdb0303b7147e73",
     "algorithm": "sha512",
     "filename": "google-search-restaurants-mobile.zip",
     "unpack": true
   }
 ]
--- a/testing/raptor/raptor/raptor.ini
+++ b/testing/raptor/raptor/raptor.ini
@@ -2,17 +2,16 @@
 [include:tests/raptor-tp6-1.ini]
 [include:tests/raptor-tp6-2.ini]
 [include:tests/raptor-tp6-3.ini]
 [include:tests/raptor-tp6-4.ini]
 [include:tests/raptor-tp6-5.ini]
 [include:tests/raptor-tp6-6.ini]
 [include:tests/raptor-tp6-7.ini]
 [include:tests/raptor-tp6-8.ini]
-[include:tests/raptor-tp6-8-404.ini]
 [include:tests/raptor-tp6-9.ini]
 [include:tests/raptor-tp6-10.ini]
 
 # raptor pageload binast tests desktop
 [include:tests/raptor-tp6-binast-1.ini]
 
 # raptor warm pageload tests mobile
 [include:tests/raptor-tp6m-1.ini]
deleted file mode 100644
--- a/testing/raptor/raptor/tests/raptor-tp6-8-404.ini
+++ /dev/null
@@ -1,103 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# raptor tp6-8
-
-[DEFAULT]
-type =  pageload
-playback = mitmproxy
-playback_version = 4.0.4
-playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
-page_cycles = 25
-unit = ms
-lower_is_better = true
-alert_threshold = 2.0
-page_timeout = 30000
-gecko_profile_interval = 1
-gecko_profile_entries = 2000000
-alert_on = fcp, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-202-firefox]
-apps = firefox
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
-playback_recordings = ebay.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-202-firefox]
-apps = firefox
-test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
-playback_recordings = wikipedia.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-404-firefox]
-apps = firefox
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay-404.manifest
-playback_recordings = ebay.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-404-firefox]
-apps = firefox
-test_url = https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
-playback_recordings = wikipedia.mp
-measure = fnbpaint, fcp, dcf, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-202-chrome]
-apps = chrome
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
-playback_recordings = ebay.mp
-measure = fcp, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-202-chrome]
-apps = chrome
-test_url =  https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
-playback_recordings = wikipedia.mp
-measure = fcp, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-404-chrome]
-apps = chrome
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay-404.manifest
-playback_recordings = ebay.mp
-measure = fcp, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-404-chrome]
-apps = chrome
-test_url =  https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
-playback_recordings = wikipedia.mp
-measure = fcp, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-202-chromium]
-apps = chromium
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay.manifest
-playback_recordings = ebay.mp
-measure = fcp, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-202-chromium]
-apps = chromium
-test_url =  https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia.manifest
-playback_recordings = wikipedia.mp
-measure = fcp, loadtime
-
-[raptor-tp6-ebay-mitm-404-recordings-404-chromium]
-apps = chromium
-test_url = https://www.ebay.com/
-playback_pageset_manifest = mitmproxy-recordings-raptor-ebay-404.manifest
-playback_recordings = ebay.mp
-measure = fcp, loadtime
-
-[raptor-tp6-wikipedia-mitm-404-recordings-404-chromium]
-apps = chromium
-test_url =  https://en.wikipedia.org/wiki/Barack_Obama
-playback_pageset_manifest = mitmproxy-recordings-raptor-wikipedia-404.manifest
-playback_recordings = wikipedia.mp
-measure = fcp, loadtime
--- a/testing/raptor/raptor/tests/raptor-tp6m-3.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6m-3.ini
@@ -21,36 +21,38 @@ test_url = https://www.google.com/maps?f
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6m-google-restaurants-geckoview]
 apps = geckoview
 test_url = https://www.google.com/search?q=restaurants+near+me
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_recordings = google-search-restaurants-mobile.mp
+playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
-disabled = Bug 1533283 Intermittent timeouts running raptor-tp6m-google-restaurants-geckoview
 
 [raptor-tp6m-google-maps-fennec]
 apps = fennec
 test_url = https://www.google.com/maps?force=pwa
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
 
 [raptor-tp6m-google-restaurants-fennec]
 apps = fennec
 test_url = https://www.google.com/search?q=restaurants+near+me
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
 playback_recordings = google-search-restaurants-mobile.mp
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+playback_version = 4.0.4
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-disabled = Bug 1541431 TEST-UNEXPECTED-FAIL: test 'raptor-tp6m-google-restaurants-fennec' timed out loading test page
 
 [raptor-tp6m-google-maps-refbrow]
 apps = refbrow
 test_url = https://www.google.com/maps?force=pwa
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/resource-timing/nested-context-navigations.html.ini
@@ -0,0 +1,4 @@
+[nested-context-navigations.html]
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1540899
+    if (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1540899