Reland device filtering and device file cl

build/android/pylib/remote/device/remote_device_test_run.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Run specific test on specific environment."""
 
 import json
 import logging
 import os
 import sys
@@ skipping 31 matching lines @@
     self._test_id = ''
     self._results = ''
     self._test_run_id = ''
 
   #override
   def SetUp(self):
     """Set up a test run."""
     if self._env.trigger:
       self._TriggerSetUp()
     elif self._env.collect:
-      assert isinstance(self._env.trigger, basestring), (
+      assert isinstance(self._env.collect, basestring), (
                         'File for storing test_run_id must be a string.')
       with open(self._env.collect, 'r') as persisted_data_file:
         persisted_data = json.loads(persisted_data_file.read())
         self._env.LoadFrom(persisted_data)
         self.LoadFrom(persisted_data)
 
   def _TriggerSetUp(self):
     """Set up the triggering of a test run."""
     raise NotImplementedError
 
@@ skipping 207 matching lines @@
       config_data.extend('%s=%s' % (k, v) for k, v in body.iteritems())
       config.write(''.join('%s\n' % l for l in config_data))
       config.flush()
       config.seek(0)
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         config_response = appurify_sanitized.api.config_upload(
             self._env.token, config, self._test_id)
       remote_device_helper.TestHttpResponse(
           config_response, 'Unable to upload test config.')