Bug 1595794 - Disable VerticalClippingTest.verticalClippingSucceeds on webrender. r=geckoview-reviewers,agi

It is currently failing, as tracked in bug 1670267.

Differential Revision: https://phabricator.services.mozilla.com/D93095
This commit is contained in:
Jamie Nicol 2020-10-09 21:56:36 +00:00
parent 279150a41e
commit ee3f8cefa1
2 changed files with 7 additions and 0 deletions

View File

@ -8,6 +8,7 @@ import android.graphics.*
import androidx.test.filters.MediumTest
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.hamcrest.Matchers.notNullValue
import org.junit.Assume.assumeThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.geckoview.GeckoResult
@ -62,6 +63,8 @@ class VerticalClippingTest : BaseSessionTest() {
@WithDisplay(height = SCREEN_HEIGHT, width = SCREEN_WIDTH)
@Test
fun verticalClippingSucceeds() {
// Disable failing test on Webrender. Bug 1670267
assumeThat(sessionRule.env.isWebrender, equalTo(false))
sessionRule.display?.setVerticalClipping(45)
sessionRule.session.loadTestPath(FIXED_BOTTOM)
sessionRule.waitUntilCalled(object : Callbacks.ContentDelegate {

View File

@ -67,6 +67,10 @@ public class Environment {
return abi.startsWith("x86");
}
public boolean isWebrender() {
return getEnvVar("MOZ_WEBRENDER").equals("1");
}
public long getScaledTimeoutMillis() {
if (isX86()) {
return isEmulator() ? DEFAULT_X86_EMULATOR_TIMEOUT_MILLIS