Update from https://crrev.com/316786

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 92 matching lines @@
     Args:
       call: a mock.call instance identifying a target to patch
       Extra keyword arguments are processed by mock.patch
 
     Returns:
       A context manager to mock/unmock the target of the call
     """
     if call.name.startswith('self.'):
       target = self.call_target(call.parent)
       _, attribute = call.name.rsplit('.', 1)
-      return mock.patch.object(target, attribute, **kwargs)
+      if (hasattr(type(target), attribute)
+          and isinstance(getattr(type(target), attribute), property)):
+        return mock.patch.object(
+            type(target), attribute, new_callable=mock.PropertyMock, **kwargs)
+      else:
+        return mock.patch.object(target, attribute, **kwargs)
     else:
       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)
@@ skipping 44 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))