Close the owned Android app after automated phone tests

This commit is contained in:
waozi committed 2026-10-28 15:40:49 -03:00
1 parent b945252c5c
commit df906829d9
3 files changed
+53 -25

No files matched your search

+9 -1
View File
@@ -32,7 +32,14 @@ capture() {
adb_run logcat -b crash -d > "$logs/android-smoke-crash.txt" 2>&1 || true
adb_run shell dumpsys activity exit-info "$app_id" > "$logs/android-smoke-exit-info.txt" 2>&1 || true
}
trap capture EXIT
started=0
cleanup() {
capture
if [ "$started" = 1 ]; then
adb_run shell am force-stop "$app_id" || true
fi
}
trap cleanup EXIT
if [ "${ANDROID_SMOKE_SKIP_EMULATOR:-0}" != 1 ]; then
env -u DISPLAY -u WAYLAND_DISPLAY ANDROID_EMULATOR_HEADLESS=1 bash scripts/emulator.sh
@@ -77,6 +84,7 @@ foreground() {
}
adb_run shell am force-stop "$app_id"
started=1
start
pid=$(process || true)
[ -n "$pid" ] || fail 'app exited during startup'
+31 -24
View File
@@ -326,30 +326,37 @@ def check(phone, apk, seconds, evidence):
phone.shell("input", "keyevent", "KEYCODE_WAKEUP")
phone.shell("wm", "dismiss-keyguard")
phone.shell("am", "force-stop", package)
phone.start(package)
time.sleep(4)
pid = phone.pid(package)
if not pid:
raise ValueError("Inner Breeze did not stay running after launch")
phone.screenshot(package, evidence / "launch.png")
phone.start(package, "-a", START_PRACTICE, "--ei", "practice_id", str(WIM_HOF))
time.sleep(3)
phone.screenshot(package, evidence / "practice-start.png")
timing = frame_timing(phone, package, seconds)
phone.screenshot(package, evidence / "practice-end.png")
if phone.pid(package) != pid:
raise ValueError("Inner Breeze restarted during the practice")
phone.shell("input", "keyevent", "KEYCODE_HOME")
time.sleep(2)
phone.start(package)
time.sleep(2)
if phone.pid(package) != pid:
raise ValueError("Inner Breeze restarted when it returned from the background")
phone.screenshot(package, evidence / "resume.png")
timing["resume_layout_shift"] = layout_shift(evidence / "practice-end.png", evidence / "resume.png")
model = phone.shell("getprop", "ro.product.model").strip()
android = phone.shell("getprop", "ro.build.version.release").strip()
return identity, timing, dict(model=model, android=android)
try:
phone.start(package)
time.sleep(4)
pid = phone.pid(package)
if not pid:
raise ValueError("Inner Breeze did not stay running after launch")
phone.screenshot(package, evidence / "launch.png")
phone.start(package, "-a", START_PRACTICE, "--ei", "practice_id", str(WIM_HOF))
time.sleep(3)
phone.screenshot(package, evidence / "practice-start.png")
timing = frame_timing(phone, package, seconds)
phone.screenshot(package, evidence / "practice-end.png")
if phone.pid(package) != pid:
raise ValueError("Inner Breeze restarted during the practice")
phone.shell("input", "keyevent", "KEYCODE_HOME")
time.sleep(2)
phone.start(package)
time.sleep(2)
if phone.pid(package) != pid:
raise ValueError("Inner Breeze restarted when it returned from the background")
phone.screenshot(package, evidence / "resume.png")
timing["resume_layout_shift"] = layout_shift(evidence / "practice-end.png", evidence / "resume.png")
model = phone.shell("getprop", "ro.product.model").strip()
android = phone.shell("getprop", "ro.build.version.release").strip()
return identity, timing, dict(model=model, android=android)
finally:
# This check refused a pre-existing process before installation. Stop
# only its own app, including any practice/audio still running.
phone.shell("am", "force-stop", package)
if phone.pid(package):
raise ValueError("the test app did not close after the phone check")
def resolve_host(host, serial):
+13
View File
@@ -100,6 +100,19 @@ class PhoneCheckGateTest(unittest.TestCase):
self.assertEqual(phone.adb.call_args_list, [mock.call("get-state")])
phone.shell.assert_not_called()
def test_practice_failure_still_closes_the_owned_app(self):
phone = mock.Mock()
phone.host = "local"
phone.adb.side_effect = [b"device\n", b"Success\n"]
phone.pid.side_effect = ["", "4321", ""]
phone.screenshot.side_effect = RuntimeError("fixture screenshot failed")
with mock.patch.object(phone_check, "apk_identity", return_value={"package": "fixture.debug"}), \
mock.patch.object(phone_check.time, "sleep"):
with self.assertRaisesRegex(RuntimeError, "fixture screenshot failed"):
phone_check.check(phone, self.root / "candidate.apk", 60, self.root)
self.assertEqual(phone.shell.call_args, mock.call("am", "force-stop", "fixture.debug"))
self.assertEqual(phone.pid.call_args, mock.call("fixture.debug"))
def test_missing_process_is_empty_but_adb_failure_is_not_ignored(self):
phone = phone_check.Phone("local", "Fixture")
with mock.patch.object(phone, "shell", side_effect=subprocess.CalledProcessError(