Bug 2006718 - Fix some typos in StartupExcessiveResourceUseTest #15 (firefox-autoland@autoland)

Warnings
  • Checking...
Blockers
  • Checking...
Branches bug2005839 -> autoland
Repo firefox-autoland@autoland (git) (git://github.com/moztcampbell/firefox.git)
Author moztcampbell
State closed
Commit Title Bug 2006718 - Fix some typos in StartupExcessiveResourceUseTest
Commit Body None

Landings

Failed to land

Landing requested on , by mathew.hodson@gmail.com.

Landing Job: 24114

While applying pull request #15 to firefox-autoland, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from firefox-autoland and re-submitting.)

  • mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt @ 3d9885918ecd02ba6a7837e45e21ca50e33caea5 
    • diff a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt	(rejected hunks)
@@ -105,16 +105,16 @@ class StartupExcessiveResourceUseTest {
...

    diff a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt	(rejected hunks)
@@ -105,16 +105,16 @@ class StartupExcessiveResourceUseTest {
     private val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
     @Test
-    fun verifyRunBlockingAndStrictModeSuppresionCount() {
+    fun verifyRunBlockingAndStrictModeSuppressionCount() {
         uiDevice.waitForIdle() // wait for async UI to load.
 
-        // This might cause intermittents: at an arbitrary point after start up (such as the visual
+        // This might cause intermittent: at an arbitrary point after start up (such as the visual
         // completeness queue), we might run code on the main thread that suppresses StrictMode,
         // causing this number to fluctuate depending on device speed. We'll deal with it if it occurs.
-        val actualSuppresionCount = activityTestRule.activity.components.strictMode.suppressionCount.get().toInt()
+        val actualSuppressionCount = activityTestRule.activity.components.strictMode.suppressionCount.get().toInt()
         val actualRunBlocking = RunBlockingCounter.count.get()
 
-        assertEquals(failureMsgStrictMode, EXPECTED_SUPPRESSION_COUNT, actualSuppresionCount)
+        assertEquals(failureMsgStrictMode, EXPECTED_SUPPRESSION_COUNT, actualSuppressionCount)
         assertTrue(failureMsgRunBlocking + "actual: $actualRunBlocking", actualRunBlocking in EXPECTED_RUNBLOCKING_RANGE)
 
         // This below asserts fail in Firebase with different values for

in addition, Git reported this error: while searching for:
    private val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())

    @Test
    fun verifyRunBlockingAndStrictModeSuppresionCount() {
        uiDevice.waitForIdle() // wait for async UI to load.

        // This might cause intermittents: at an arbitrary point after start up (such as the visual
        // completeness queue), we might run code on the main thread that suppresses StrictMode,
        // causing this number to fluctuate depending on device speed. We'll deal with it if it occurs.
        val actualSuppresionCount = activityTestRule.activity.components.strictMode.suppressionCount.get().toInt()
        val actualRunBlocking = RunBlockingCounter.count.get()

        assertEquals(failureMsgStrictMode, EXPECTED_SUPPRESSION_COUNT, actualSuppresionCount)
        assertTrue(failureMsgRunBlocking + "actual: $actualRunBlocking", actualRunBlocking in EXPECTED_RUNBLOCKING_RANGE)

        // This below asserts fail in Firebase with different values for

Last update: 

Raw error output:
Problem while applying patch in revision None:

Checking patch mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt...
error: while searching for:
    private val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())

    @Test
    fun verifyRunBlockingAndStrictModeSuppresionCount() {
        uiDevice.waitForIdle() // wait for async UI to load.

        // This might cause intermittents: at an arbitrary point after start up (such as the visual
        // completeness queue), we might run code on the main thread that suppresses StrictMode,
        // causing this number to fluctuate depending on device speed. We'll deal with it if it occurs.
        val actualSuppresionCount = activityTestRule.activity.components.strictMode.suppressionCount.get().toInt()
        val actualRunBlocking = RunBlockingCounter.count.get()

        assertEquals(failureMsgStrictMode, EXPECTED_SUPPRESSION_COUNT, actualSuppresionCount)
        assertTrue(failureMsgRunBlocking + "actual: $actualRunBlocking", actualRunBlocking in EXPECTED_RUNBLOCKING_RANGE)

        // This below asserts fail in Firebase with different values for

error: patch failed: mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt:105
Applying patch mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt with 1 reject...
Rejected hunk #1.
Successfully landed

Landing requested on , by tcampbell@mozilla.com.

Landing Job: 23854

Last update:

Result: 3d9885918ecd02ba6a7837e45e21ca50e33caea5 on firefox-autoland@autoland (git)

Links: Treeherder