Bug 1553515 - Enable geckoview-test on debug x86_64. r=snorp
authorAgi Sferro <agi@sferro.dev>
Wed, 14 Aug 2019 16:29:43 +0000
changeset 487963 0a70ad667f71c0a16d0e979d11b46a0093b2a401
parent 487962 8fb70426d3408bd534b306103f4a0099f89e3914
child 487964 ae221b6288996b15104e52c497e2cae59da9f536
push id36434
push usercbrindusan@mozilla.com
push dateThu, 15 Aug 2019 09:44:30 +0000
treeherdermozilla-central@144fbfb409b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1553515
milestone70.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
Bug 1553515 - Enable geckoview-test on debug x86_64. r=snorp This turns off geckoview-test on arm debug. Differential Revision: https://phabricator.services.mozilla.com/D41695
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaElementTest.kt
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
@@ -42,17 +42,18 @@ import org.mozilla.geckoview.GeckoSessio
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.Setting
 
 const val DISPLAY_WIDTH = 480
 const val DISPLAY_HEIGHT = 640
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
 @WithDisplay(width = DISPLAY_WIDTH, height = DISPLAY_HEIGHT)
-class AccessibilityTest : BaseSessionTest() {
+// TODO: Bug 1564507, to work around it we run AccessibilityTest at the end
+class ZZAccessibilityTest : BaseSessionTest() {
     lateinit var view: View
     val screenRect = Rect(0, 0, DISPLAY_WIDTH, DISPLAY_HEIGHT)
     val provider: AccessibilityNodeProvider get() = view.accessibilityNodeProvider
     private val nodeInfos = mutableListOf<AccessibilityNodeInfo>()
 
     // Given a child ID, return the virtual descendent ID.
     private fun getVirtualDescendantId(childId: Long): Int {
         try {
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaElementTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaElementTest.kt
@@ -228,17 +228,17 @@ class MediaElementTest : BaseSessionTest
 
     @Test
     fun oggPauseMedia() {
         pauseMedia(VIDEO_OGG_PATH)
     }
 
     @Test
     fun oggTimeMedia() {
-        timeMedia(VIDEO_OGG_PATH, 2.0)
+        timeMedia(VIDEO_OGG_PATH, 0.2)
     }
 
     @Test
     fun oggMetadataMedia() {
         val meta = waitForMetadata(VIDEO_OGG_PATH)
         assertThat("Current source is set", meta?.currentSource,
                 equalTo("$TEST_ENDPOINT/assets/www/videos/video.ogg"))
         assertThat("Width is set", meta?.width, equalTo(320L))
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt
@@ -1,16 +1,14 @@
 /* -*- 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.os.Handler
-import android.os.Looper
 import android.support.test.InstrumentationRegistry
 import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.ContentBlocking
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoSession
 import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest
 import org.mozilla.geckoview.GeckoSessionSettings
 import org.mozilla.geckoview.WebRequestError
@@ -24,16 +22,17 @@ import org.mozilla.geckoview.test.util.C
 import android.support.test.filters.MediumTest
 import android.support.test.runner.AndroidJUnit4
 import org.hamcrest.Matchers.*
 import org.json.JSONObject
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
+import org.junit.Assume.assumeThat
 import org.junit.runner.RunWith
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule
 import org.mozilla.geckoview.test.util.HttpBin
 import org.mozilla.geckoview.test.util.UiThreadUtils
 import java.net.URI
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
@@ -192,16 +191,20 @@ class NavigationDelegateTest : BaseSessi
         }
         testLoadExpectError(uri,
                 WebRequestError.ERROR_CATEGORY_SECURITY,
                 WebRequestError.ERROR_SECURITY_BAD_CERT)
     }
 
     @Setting(key = Setting.Key.USE_TRACKING_PROTECTION, value = "true")
     @Test fun trackingProtection() {
+        // TODO: Bug 1564373
+        assumeThat(sessionRule.env.isDebugBuild && sessionRule.env.isX86,
+                equalTo(false))
+
         val category = ContentBlocking.AntiTracking.TEST
         sessionRule.runtime.settings.contentBlocking.setAntiTracking(category)
         sessionRule.session.loadTestPath(TRACKERS_PATH)
 
         sessionRule.waitUntilCalled(
                 object : Callbacks.ContentBlockingDelegate {
             @AssertCalled(count = 3)
             override fun onContentBlocked(session: GeckoSession,
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -332,17 +332,16 @@ macosx1014-64-ccov/debug:
 # Android platforms (matching /android-em.*/)
 #
 # android-em test platforms execute on android emulators.
 
 android-em-4.3-arm7-api-16/debug:
     build-platform: android-api-16/debug
     test-sets:
         - android-common-tests
-        - android-debug-tests
 
 # Disable ccov testing on Android due to issues with
 # Java 8 features. Bug 1498721.
 # android-em-4.3-arm7-api-16-ccov/debug:
 #     build-platform: android-api-16-ccov/debug
 #     test-sets:
 #         - android-ccov-tests
 
@@ -357,17 +356,16 @@ android-em-4.3-arm7-api-16/pgo:
     test-sets:
         - android-common-tests
         - android-opt-tests
 
 android-em-7.0-x86_64/opt:
     build-platform: android-x86_64/opt
     test-sets:
         - android-x86_64-tests
-        - android-x86_64-opt-tests
 
 android-em-7.0-x86_64/debug:
     build-platform: android-x86_64/debug
     test-sets:
         - android-x86_64-tests
 
 # android-hw test platforms execute on real devices attached to Autophone hosts.
 
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -400,25 +400,20 @@ android-common-tests:
     - reftest
     - test-verify
     - xpcshell
 
 android-opt-tests:
     # Robocop tests often fail on Debug builds
     - robocop
 
-android-debug-tests:
-    - geckoview-junit
-
-android-x86_64-opt-tests:
-    - geckoview-junit
-
 android-x86_64-tests:
     - cppunit
     - crashtest
+    - geckoview-junit
     - gtest
     - marionette
     - mochitest
     - mochitest-gpu
     - reftest
     - test-verify
     - web-platform-tests
     - web-platform-tests-reftests