LISA: make SysUi workload use package list
The Workload class can now automatically install missing dependencies
stored in a workload's "packages" variable. Modify the SystemUi
workload to allow installing UbSystemUiJankTests automatically.
Also eliminate the "package" variable since the device will always
have the SystemUi package installed.
Test: Ran ./experiments/runsysui.py on a device without the tests installed
Change-Id: I415f0dd9309d5572ccacfdcceb91eff10cdb478c
Signed-off-by: Connor O'Brien <connoro@google.com>
diff --git a/libs/utils/android/workloads/systemui.py b/libs/utils/android/workloads/systemui.py
index 9e46631..6aea799 100644
--- a/libs/utils/android/workloads/systemui.py
+++ b/libs/utils/android/workloads/systemui.py
@@ -31,10 +31,15 @@
Android SystemUi jank test workload
"""
- package = 'com.android.systemui'
+ # Packages required by this workload
+ packages = [
+ Workload.WorkloadPackage("android.platform.systemui.tests.jank",
+ "data/app/UbSystemUiJankTests/UbSystemUiJankTests.apk",
+ "platform_testing/tests/jank/UbSystemUiJankTests")
+ ]
# Instrumentation required to run tests
- test_package = 'android.platform.systemui.tests.jank'
+ test_package = packages[0].package_name
test_list = \
["LauncherJankTests#testOpenAllAppsContainer",
@@ -110,9 +115,6 @@
# Unlock device screen (assume no password required)
Screen.unlock(self._target)
- # Close and clear application
- System.force_stop(self._target, self.package, clear=True)
-
# Set airplane mode
System.set_airplane_mode(self._target, on=True)
