From cab9d918abe9ea1833d70dc4c86f39e2137e7587 Mon Sep 17 00:00:00 2001 From: John Richardson Date: Wed, 31 Aug 2016 14:43:33 +0100 Subject: [PATCH] Move uiautomator params in AndroidUxPerfWorkload uiautomator parameters are set per instance of a workload and not per iteration. Move uiautomator parameter assignment from setup() to validate(). --- wlauto/common/android/workload.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlauto/common/android/workload.py b/wlauto/common/android/workload.py index eee1aa78..37dadf39 100644 --- a/wlauto/common/android/workload.py +++ b/wlauto/common/android/workload.py @@ -516,10 +516,13 @@ class AndroidUxPerfWorkload(AndroidUiAutoBenchmark): # Turn class attribute into instance attribute self.deployable_assets = list(self.deployable_assets) + def validate(self): + super(AndroidUxPerfWorkload, self).validate() + self.uiauto_params['markers_enabled'] = self.markers_enabled + def setup(self, context): super(AndroidUxPerfWorkload, self).setup(context) self.push_assets(context) - self.uiauto_params['markers_enabled'] = self.markers_enabled def teardown(self, context): super(AndroidUxPerfWorkload, self).teardown(context)