Make device serial required in AdbWrapper/DeviceUtils

build/android/pylib/instrumentation/test_runner_test.py

 #!/usr/bin/env python
 # 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.
 
 
 """Unit tests for instrumentation.TestRunner."""
 
 # pylint: disable=W0212
 
 import os
 import sys
 import unittest
 
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.instrumentation import test_runner
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))
 import mock  # pylint: disable=F0401
 
 
 class InstrumentationTestRunnerTest(unittest.TestCase):
 
   def setUp(self):
     options = mock.Mock()
     options.tool = ''
     package = mock.Mock()
-    self.instance = test_runner.TestRunner(options, None, 0, package)
+    self.instance = test_runner.TestRunner(
+        options, '123456789abcdef0', 0, package)
 
   def testParseAmInstrumentRawOutput_nothing(self):
     code, result, statuses = (
         test_runner.TestRunner._ParseAmInstrumentRawOutput(['']))
     self.assertEqual(None, code)
     self.assertEqual([], result)
     self.assertEqual([], statuses)
 
   def testParseAmInstrumentRawOutput_noMatchingStarts(self):
     raw_output = [
@@ skipping 178 matching lines @@
     statuses = [
       (1, {
         'class': ['test.package.TestClass'],
         'test': ['testMethod'],
       }),
       (-2, {
         'class': ['test.package.TestClass'],
         'test': ['testMethod'],
       }),
     ]
+    self.instance.device.old_interface.DismissCrashDialogIfNeeded = mock.Mock(
+        return_value=None)
     result = self.instance._GenerateTestResult(
         'test.package.TestClass#testMethod', statuses, 0, 1000)
     self.assertEqual(base_test_result.ResultType.FAIL, result.GetType())
 
   def testGenerateTestResult_testCrashed(self):
     self.instance.test_pkg.GetPackageName = mock.Mock(
         return_value='generate.test.result.test.package')
     self.instance.device.old_interface.DismissCrashDialogIfNeeded = mock.Mock(
         return_value='generate.test.result.test.package')
     statuses = [
@@ skipping 24 matching lines @@
         'test.package/MyTestRunner', raw=True,
         extras={
             'test_arg_key': 'test_arg_value',
             'class': 'test.package.TestClass#testMethod'
         },
         timeout=100, retries=0)
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)