From 7ccac87b93d9381097563d8744fb569ae0affabd Mon Sep 17 00:00:00 2001 From: Sebastian Goscik Date: Tue, 24 May 2016 15:59:28 +0100 Subject: [PATCH] cameracapture & camerarecord: Fixed parameters Parameters were not being passed to the UI automation properly --- wlauto/workloads/cameracapture/__init__.py | 7 ++----- wlauto/workloads/camerarecord/__init__.py | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/wlauto/workloads/cameracapture/__init__.py b/wlauto/workloads/cameracapture/__init__.py index 7e7e2aab..2ac7f979 100644 --- a/wlauto/workloads/cameracapture/__init__.py +++ b/wlauto/workloads/cameracapture/__init__.py @@ -40,13 +40,10 @@ class Cameracapture(UiAutomatorWorkload): description='Time, in seconds, between two consecutive camera clicks.'), ] - def __init__(self, device, **kwargs): - super(Cameracapture, self).__init__(device, **kwargs) - self.uiauto_params['no_of_captures'] = self.no_of_captures - self.uiauto_params['time_between_captures'] = self.time_between_captures - def initialize(self, context): api = self.device.get_sdk_version() + self.uiauto_params['no_of_captures'] = self.no_of_captures + self.uiauto_params['time_between_captures'] = self.time_between_captures self.uiauto_params['api_level'] = api self.package = self.api_packages[api] version = self.device.get_installed_package_version(self.package) diff --git a/wlauto/workloads/camerarecord/__init__.py b/wlauto/workloads/camerarecord/__init__.py index b39ab143..d0586d30 100644 --- a/wlauto/workloads/camerarecord/__init__.py +++ b/wlauto/workloads/camerarecord/__init__.py @@ -38,13 +38,10 @@ class Camerarecord(UiAutomatorWorkload): description='The video recording time in seconds.'), ] - def __init__(self, device, **kwargs): - super(Camerarecord, self).__init__(device) + def initialize(self, context): self.uiauto_params['recording_time'] = self.recording_time # pylint: disable=E1101 self.uiauto_params['version'] = "button" self.run_timeout = 3 * self.uiauto_params['recording_time'] - - def initialize(self, context): api = self.device.get_sdk_version() self.uiauto_params['api_level'] = api self.package = self.api_packages[api]