зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1622944: Update xMultipleSessions junit tests to be sensitive to dom.ipc.processCount; r=geckoview-reviewers,agi
We need to move these tests to their own class so that we can add a `@Before` function to set up the expected start conditions. We also need to allocate the second session in such a way that it is hosted by the same content process as `mainSession`. The previous scheme of waiting on each `GeckoResult` independently caused deadlocks if the results are resolved in a different order, so I replaced those two waits with a `GeckoView.allOf` result that will Just Work (TM). Note that this scheme works both in single-e10s and multi-e10s configurations. Differential Revision: https://phabricator.services.mozilla.com/D67067
This commit is contained in:
Aaron Klotz
Родитель
017fe21816
Коммит
e544916dbe
|
|
@ -0,0 +1,187 @@
|
|||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
|
||||
* Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
package org.mozilla.geckoview.test
|
||||
|
||||
import android.app.ActivityManager
|
||||
import android.content.Context
|
||||
import android.graphics.Matrix
|
||||
import android.graphics.SurfaceTexture
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.os.LocaleList
|
||||
import android.os.Process
|
||||
import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay
|
||||
import org.mozilla.geckoview.test.util.Callbacks
|
||||
|
||||
import android.support.annotation.AnyThread
|
||||
import androidx.test.filters.MediumTest
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import android.util.Pair
|
||||
import android.util.SparseArray
|
||||
import android.view.Surface
|
||||
import android.view.View
|
||||
import android.view.ViewStructure
|
||||
import android.view.autofill.AutofillId
|
||||
import android.view.autofill.AutofillValue
|
||||
import org.hamcrest.Matchers.*
|
||||
import org.json.JSONObject
|
||||
import org.junit.Assume.assumeThat
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mozilla.gecko.GeckoAppShell
|
||||
import org.mozilla.geckoview.*
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate
|
||||
|
||||
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@MediumTest
|
||||
class ContentDelegateMultipleSessionsTest : BaseSessionTest() {
|
||||
val contentProcNameRegex = ".*:tab\\d+$".toRegex()
|
||||
|
||||
@AnyThread
|
||||
fun killAllContentProcesses() {
|
||||
val context = GeckoAppShell.getApplicationContext()
|
||||
val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
|
||||
for (info in manager.runningAppProcesses) {
|
||||
if (info.processName.matches(contentProcNameRegex)) {
|
||||
Process.killProcess(info.pid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun resetContentProcesses() {
|
||||
val isMainSessionAlreadyOpen = mainSession.isOpen()
|
||||
killAllContentProcesses()
|
||||
|
||||
if (isMainSessionAlreadyOpen) {
|
||||
mainSession.waitUntilCalled(object : Callbacks.ContentDelegate {
|
||||
@AssertCalled(count = 1)
|
||||
override fun onKill(session: GeckoSession) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
mainSession.open()
|
||||
}
|
||||
|
||||
fun getE10sProcessCount(): Int {
|
||||
val extensionProcessPref = "extensions.webextensions.remote"
|
||||
val isExtensionProcessEnabled = (sessionRule.getPrefs(extensionProcessPref)[0] as Boolean)
|
||||
val e10sProcessCountPref = "dom.ipc.processCount"
|
||||
var numContentProcesses = (sessionRule.getPrefs(e10sProcessCountPref)[0] as Int)
|
||||
|
||||
if (isExtensionProcessEnabled && numContentProcesses > 1) {
|
||||
// Extension process counts against the content process budget
|
||||
--numContentProcesses
|
||||
}
|
||||
|
||||
return numContentProcesses
|
||||
}
|
||||
|
||||
// This function ensures that a second GeckoSession that shares the same
|
||||
// content process as mainSession is returned to the test:
|
||||
//
|
||||
// First, we assume that we're starting with a known initial state with respect
|
||||
// to sessions and content processes:
|
||||
// * mainSession is the only session, it is open, and its content process is the only
|
||||
// content process (but note that the content process assigned to mainSession is
|
||||
// *not* guaranteed to be ":tab0").
|
||||
// * With multi-e10s configured to run N content processes, we create and open
|
||||
// an additional N content processes. With the default e10s process allocation
|
||||
// scheme, this means that the first N-1 new sessions we create each get their
|
||||
// own content process. The Nth new session is assigned to the same content
|
||||
// process as mainSession, which is the session we want to return to the test.
|
||||
fun getSecondGeckoSession(): GeckoSession {
|
||||
val numContentProcesses = getE10sProcessCount()
|
||||
|
||||
// If we change the content process allocation scheme, this function will need to be
|
||||
// fixed to ensure that we still have two test sessions in at least one content
|
||||
// process (with one of those sessions being mainSession).
|
||||
val additionalSessions = Array(numContentProcesses) { _ -> sessionRule.createOpenSession() }
|
||||
|
||||
// The second session that shares a process with mainSession should be at
|
||||
// the end of the array.
|
||||
return additionalSessions.last()
|
||||
}
|
||||
|
||||
@Before
|
||||
fun setup() {
|
||||
resetContentProcesses()
|
||||
}
|
||||
|
||||
@IgnoreCrash
|
||||
@Test fun crashContentMultipleSessions() {
|
||||
// This test doesn't make sense without multiprocess
|
||||
assumeThat(sessionRule.env.isMultiprocess, equalTo(true))
|
||||
|
||||
val newSession = getSecondGeckoSession()
|
||||
|
||||
// We can inadvertently catch the `onCrash` call for the cached session if we don't specify
|
||||
// individual sessions here. Therefore, assert 'onCrash' is called for the two sessions
|
||||
// individually...
|
||||
val mainSessionCrash = GeckoResult<Void>()
|
||||
val newSessionCrash = GeckoResult<Void>()
|
||||
|
||||
// ...but we use GeckoResult.allOf for waiting on the aggregated results
|
||||
val allCrashesFound = GeckoResult.allOf(mainSessionCrash, newSessionCrash)
|
||||
|
||||
sessionRule.delegateUntilTestEnd(object : Callbacks.ContentDelegate {
|
||||
fun reportCrash(session: GeckoSession) {
|
||||
if (session == mainSession) {
|
||||
mainSessionCrash.complete(null)
|
||||
} else if (session == newSession) {
|
||||
newSessionCrash.complete(null)
|
||||
}
|
||||
}
|
||||
// Slower devices may not catch crashes in a timely manner, so we check to see
|
||||
// if either `onKill` or `onCrash` is called
|
||||
override fun onCrash(session: GeckoSession) {
|
||||
reportCrash(session)
|
||||
}
|
||||
override fun onKill(session: GeckoSession) {
|
||||
reportCrash(session)
|
||||
}
|
||||
})
|
||||
|
||||
newSession.loadTestPath(HELLO_HTML_PATH)
|
||||
newSession.waitForPageStop()
|
||||
|
||||
mainSession.loadUri(CONTENT_CRASH_URL)
|
||||
|
||||
sessionRule.waitForResult(allCrashesFound)
|
||||
}
|
||||
|
||||
@IgnoreCrash
|
||||
@Test fun killContentMultipleSessions() {
|
||||
assumeThat(sessionRule.env.isMultiprocess, equalTo(true))
|
||||
|
||||
val newSession = getSecondGeckoSession()
|
||||
|
||||
val mainSessionKilled = GeckoResult<Void>()
|
||||
val newSessionKilled = GeckoResult<Void>()
|
||||
|
||||
val allKillEventsReceived = GeckoResult.allOf(mainSessionKilled, newSessionKilled)
|
||||
|
||||
sessionRule.delegateUntilTestEnd(object : Callbacks.ContentDelegate {
|
||||
override fun onKill(session: GeckoSession) {
|
||||
if (session == mainSession) {
|
||||
mainSessionKilled.complete(null)
|
||||
} else if (session == newSession) {
|
||||
newSessionKilled.complete(null)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
killAllContentProcesses()
|
||||
|
||||
sessionRule.waitForResult(allKillEventsReceived)
|
||||
}
|
||||
}
|
||||
|
|
@ -131,54 +131,13 @@ class ContentDelegateTest : BaseSessionTest() {
|
|||
mainSession.waitForPageStop()
|
||||
}
|
||||
|
||||
@IgnoreCrash
|
||||
@Test fun crashContentMultipleSessions() {
|
||||
// This test doesn't make sense without multiprocess
|
||||
assumeThat(sessionRule.env.isMultiprocess, equalTo(true))
|
||||
|
||||
// XXX we need to make sure all sessions in a given content process receive onCrash().
|
||||
// If we add multiple content processes, this test will need to be fixed to ensure the
|
||||
// test sessions go into the same one.
|
||||
val newSession = sessionRule.createOpenSession()
|
||||
|
||||
// We can inadvertently catch the `onCrash` call for the cached session if we don't specify
|
||||
// individual sessions here. Therefore, assert 'onCrash' is called for the two sessions
|
||||
// individually.
|
||||
val mainSessionCrash = GeckoResult<Void>()
|
||||
val newSessionCrash = GeckoResult<Void>()
|
||||
sessionRule.delegateUntilTestEnd(object : Callbacks.ContentDelegate {
|
||||
fun reportCrash(session: GeckoSession) {
|
||||
if (session == mainSession) {
|
||||
mainSessionCrash.complete(null)
|
||||
} else if (session == newSession) {
|
||||
newSessionCrash.complete(null)
|
||||
}
|
||||
}
|
||||
// Slower devices may not catch crashes in a timely manner, so we check to see
|
||||
// if either `onKill` or `onCrash` is called
|
||||
override fun onCrash(session: GeckoSession) {
|
||||
reportCrash(session)
|
||||
}
|
||||
override fun onKill(session: GeckoSession) {
|
||||
reportCrash(session)
|
||||
}
|
||||
})
|
||||
|
||||
newSession.loadTestPath(HELLO_HTML_PATH)
|
||||
newSession.waitForPageStop()
|
||||
|
||||
mainSession.loadUri(CONTENT_CRASH_URL)
|
||||
|
||||
sessionRule.waitForResult(newSessionCrash)
|
||||
sessionRule.waitForResult(mainSessionCrash)
|
||||
}
|
||||
|
||||
@AnyThread
|
||||
fun killContentProcess() {
|
||||
fun killAllContentProcesses() {
|
||||
val context = GeckoAppShell.getApplicationContext()
|
||||
val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
|
||||
val expr = ".*:tab\\d+$".toRegex()
|
||||
for (info in manager.runningAppProcesses) {
|
||||
if (info.processName.endsWith(":tab0")) {
|
||||
if (info.processName.matches(expr)) {
|
||||
Process.killProcess(info.pid)
|
||||
}
|
||||
}
|
||||
|
|
@ -190,7 +149,7 @@ class ContentDelegateTest : BaseSessionTest() {
|
|||
assumeThat(sessionRule.env.isDebugBuild && sessionRule.env.isX86,
|
||||
equalTo(false))
|
||||
|
||||
killContentProcess()
|
||||
killAllContentProcesses()
|
||||
mainSession.waitUntilCalled(object : Callbacks.ContentDelegate {
|
||||
@AssertCalled(count = 1)
|
||||
override fun onKill(session: GeckoSession) {
|
||||
|
|
@ -209,26 +168,6 @@ class ContentDelegateTest : BaseSessionTest() {
|
|||
})
|
||||
}
|
||||
|
||||
@IgnoreCrash
|
||||
@Test fun killContentMultipleSessions() {
|
||||
assumeThat(sessionRule.env.isMultiprocess, equalTo(true))
|
||||
assumeThat(sessionRule.env.isDebugBuild && sessionRule.env.isX86,
|
||||
equalTo(false))
|
||||
|
||||
val newSession = sessionRule.createOpenSession()
|
||||
killContentProcess()
|
||||
|
||||
val remainingSessions = mutableListOf(newSession, mainSession)
|
||||
while (remainingSessions.isNotEmpty()) {
|
||||
sessionRule.waitUntilCalled(object : Callbacks.ContentDelegate {
|
||||
@AssertCalled(count = 1)
|
||||
override fun onKill(session: GeckoSession) {
|
||||
remainingSessions.remove(session)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
private fun goFullscreen() {
|
||||
sessionRule.setPrefsUntilTestEnd(mapOf("full-screen-api.allow-trusted-requests-only" to false))
|
||||
mainSession.loadTestPath(FULLSCREEN_PATH)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче