Make device serial required in AdbWrapper/DeviceUtils

build/android/pylib/utils/mock_calls.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.
 
 """
 A test facility to assert call sequences while mocking their behavior.
 """
 
 import os
 import sys
@@ skipping 104 matching lines @@
       return mock.patch(call.name, **kwargs)
 
   def watchCalls(self, calls):
     """Add calls to the set of watched calls.
 
     Args:
       calls: a sequence of mock.call instances identifying targets to watch
     """
     self._watched.update((call.name, call) for call in calls)
 
-  def watchMethodCalls(self, call):
+  def watchMethodCalls(self, call, ignore=None):
     """Watch all public methods of the target identified by a self.call.
 
     Args:
       call: a self.call instance indetifying an object
+      ignore: a list of public methods to ignore when watching for calls
     """
     target = self.call_target(call)
+    if ignore is None:
+      ignore = []
     self.watchCalls(getattr(call, method)
                     for method in dir(target.__class__)
-                    if not method.startswith('_'))
+                    if not method.startswith('_') and not method in ignore)
 
   def clearWatched(self):
     """Clear the set of watched calls."""
     self._watched = {}
 
   def assertCalls(self, *calls):
     """A context manager to assert that a sequence of calls is made.
 
     During the assertion, a number of functions and methods will be "watched",
     and any calls made to them is expected to appear---in the exact same order,
@@ skipping 20 matching lines @@
     Raises:
       AssertionError if the watched targets do not receive the exact sequence
           of calls specified. Missing calls, extra calls, and calls with
           mismatching arguments, all cause the assertion to fail.
     """
     return self._AssertCalls(self, calls, self._watched)
 
   def assertCall(self, call, action=None):
     return self.assertCalls((call, action))