Bug 1161631 - Autophone - Make PhoneTest use PhoneWorkerSubProcess in…

…stance of ADBAndroid, r=gbrown.

phonetest.py

@@ -180,7 +180,6 @@ def __init__(self, phone, options, config_file=None, chunk=1, repos=[]):
         self.loggerdeco.info('init autophone.phonetest')
         self._base_device_path = ''
         self.profile_path = '/data/local/tmp/profile'
-        self._dm = None
         self.repos = repos
         self._log = None
         # Treeherder related items.
@@ -230,7 +229,7 @@ def _add_instance(self, phoneid, config_file, chunk):
 
     def _check_device(self):
         for attempt in range(1, self.options.phone_retry_limit+1):
-            output = self._dm.get_state()
+            output = self.dm.get_state()
             if output == 'device':
                 break
             self.loggerdeco.warning(
@@ -250,18 +249,7 @@ def name(self):
 
     @property
     def dm(self):
-        if not self._dm:
-            self.loggerdeco.info('PhoneTest: Connecting to %s...' % self.phone.id)
-            self._dm = ADBDevice(device=self.phone.serial,
-                                 logger_name='autophone.phonetest.adb',
-                                 device_ready_retry_wait=self.options.device_ready_retry_wait,
-                                 device_ready_retry_attempts=self.options.device_ready_retry_attempts,
-                                 verbose=self.options.verbose)
-            # Override mozlog.logger
-            self._dm._logger = self.loggerdeco
-            self.loggerdeco.info('PhoneTest: Connected.')
-        self._check_device()
-        return self._dm
+        return self.worker_subprocess.dm
 
     @property
     def base_device_path(self):
@@ -486,11 +474,6 @@ def teardown_job(self):
         if self.dm_logger_original:
             self.dm._logger = self.dm_logger_original
 
-    def set_dm_debug(self, level):
-        self.options.debug = level
-        if self._dm:
-            self._dm.log_level = level
-
     def update_status(self, phone_status=None, message=None):
         if self.update_status_cb:
             self.update_status_cb(build=self.build,

worker.py

@@ -720,8 +720,6 @@ def handle_cmd(self, request, current_test=None):
             # update any existing ADB objects
             if self.dm:
                 self.dm.log_level = self.options.debug
-            for t in self.tests:
-                t.set_dm_debug(self.options.debug)
             return {'interrupt': False, 'reason': ''}
         if request[0] == 'ping':
             self.loggerdeco.info('Pinging at user\'s request...')