Skip to content

Commit 2d2e320

Browse files
authored
Fix Emulator Error & Add Flake Tracker to nightly notification
1 parent 9eb4d33 commit 2d2e320

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

scripts/gha/integration_testing/gameloop_android/app/src/androidTest/java/com/google/firebase/gameloop/GameLoopUITest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@ package com.google.firebase.gameloop
22

33
import androidx.test.ext.junit.rules.ActivityScenarioRule
44
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
import androidx.test.filters.LargeTest
56
import androidx.test.filters.SdkSuppress
67
import androidx.test.platform.app.InstrumentationRegistry
78
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
89
import androidx.test.uiautomator.By
910
import androidx.test.uiautomator.UiDevice
1011
import androidx.test.uiautomator.Until
11-
import junit.framework.Assert.assertNotNull
12+
import org.junit.Assert.assertNotNull
1213
import org.junit.Before
1314
import org.junit.Rule
1415
import org.junit.Test
1516
import org.junit.runner.RunWith
1617

1718
@RunWith(AndroidJUnit4::class)
1819
@SdkSuppress(minSdkVersion = 18)
20+
@LargeTest
1921
class GameLoopUITest {
2022

2123
companion object {

scripts/gha/integration_testing/test_validation.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ def summarize_test_results(tests, platform, summary_dir, file_name="summary.log"
233233
summary_json["failures"][testapp]["raw_result_link"] = test.raw_result_link
234234
failed_tests = re.findall(r"\[ FAILED \] (.+)[.](.+)", results.summary)
235235
for failed_test in failed_tests:
236-
failed_test = failed_test[1]
237-
pattern = fr'\[ RUN \] (.+)[.]{failed_test}(.*?)\[ FAILED \] (.+)[.]{failed_test}'
236+
failed_test = failed_test[0] + "." + failed_test[1]
237+
pattern = fr'\[ RUN \] {failed_test}(.*?)\[ FAILED \] {failed_test}'
238238
failure_log = re.search(pattern, test.logs, re.MULTILINE | re.DOTALL)
239239
summary_json["failures"][testapp]["failed_tests"][failed_test] = failure_log.group()
240240
summary.append("\n%s FAILED:\n%s\n" % (failed_test, failure_log.group()))
@@ -243,7 +243,6 @@ def summarize_test_results(tests, platform, summary_dir, file_name="summary.log"
243243
f.write(json.dumps(summary_json, indent=2))
244244

245245
summary = "\n".join(summary)
246-
logging.info(summary)
247246
write_summary(summary_dir, summary, file_name)
248247

249248
return 0 if len(tests) == len(successes) else 1

scripts/gha/it_workflow.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
_COMMENT_TITLE_FAIL = "### ❌  Integration test FAILED\n"
6363
_COMMENT_TITLE_SUCCEED = "### ✅  Integration test succeeded!\n"
6464

65+
_COMMENT_FLAKY_TRACKER = "\nAdd flaky tests to **[go/fpl-cpp-flake-tracker](http://go/fpl-cpp-flake-tracker)**\n"
66+
6567
_COMMENT_IDENTIFIER = "integration-test-status-comment"
6668
_COMMENT_SUFFIX = f'\n\n\n<hidden value="{_COMMENT_IDENTIFIER}"></hidden>'
6769

@@ -178,6 +180,7 @@ def test_report(token, actor, commit, run_id):
178180
comment = (_COMMENT_TITLE_FAIL +
179181
_get_description(actor, commit, run_id) +
180182
log_summary +
183+
_COMMENT_FLAKY_TRACKER +
181184
_COMMENT_SUFFIX)
182185
github.update_issue_comment(token, issue_number, comment)
183186

scripts/gha/test_simulator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,14 +585,14 @@ def _install_android_app(app_path):
585585
"""Install integration_test app into the emulator."""
586586
args = ["adb", "install", app_path]
587587
logging.info("Install testapp: %s", " ".join(args))
588-
subprocess.run(args=args, check=True)
588+
subprocess.run(args=args, check=False)
589589

590590

591591
def _uninstall_android_app(package_name):
592592
"""Uninstall integration_test app from the emulator."""
593593
args = ["adb", "uninstall", package_name]
594594
logging.info("Uninstall testapp: %s", " ".join(args))
595-
subprocess.run(args=args, check=True)
595+
subprocess.run(args=args, check=False)
596596

597597

598598
def _install_android_gameloop_app(gameloop_project):

0 commit comments

Comments
 (0)