From ba34b973acd699355f3276d0b3afb9029cbbda98 Mon Sep 17 00:00:00 2001 From: James Hartley Date: Thu, 10 Nov 2016 18:46:31 +0000 Subject: [PATCH] ApkWorkload: add check for an exact APK version Checks for an APK version on the host or target which matches a specified value --- wlauto/common/android/workload.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wlauto/common/android/workload.py b/wlauto/common/android/workload.py index a1298e4f..8c1b0067 100644 --- a/wlauto/common/android/workload.py +++ b/wlauto/common/android/workload.py @@ -199,6 +199,7 @@ class ApkWorkload(Workload): self.apk_file = None self.apk_version = None self.logcat_log = None + self.exact_apk_version = None def setup(self, context): Workload.setup(self, context) @@ -227,6 +228,11 @@ class ApkWorkload(Workload): msg = "Could not find APK for '{}' on the host or target device" raise ResourceError(msg.format(self.name)) + if self.exact_apk_version is not None: + if self.exact_apk_version != target_version and self.version != host_version: + msg = "APK version '{}' not found on the host '{}' or target '{}'" + raise ResourceError(msg.format(self.version, host_version, target_version)) + # Ensure the apk is setup on the device if self.force_install: self.force_install_apk(context, host_version)