Fix device_utils.SetProp not properly clearing cached value

build/android/pylib/device/device_utils.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.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 1540 matching lines @@
     Raises:
       CommandFailedError if check is true and the property was not correctly
         set on the device (e.g. because it is not rooted).
       CommandTimeoutError on timeout.
     """
     assert isinstance(property_name, basestring), (
         "property_name is not a string: %r" % property_name)
     assert isinstance(value, basestring), "value is not a string: %r" % value
 
     self.RunShellCommand(['setprop', property_name, value], check_return=True)
-    if property_name in self._cache:
-      del self._cache[property_name]
+    cache_key = '_prop:' + property_name

[jbudorick, 2015/08/11 00:47:54]

optional nit: wdyt about a _PropertyCacheKey function here and up in GetProp?

[agrieve, 2015/08/11 13:51:56]

If we're going to go with having sub-caches for APK checksums, then it might
make more sense to have this in its own namespace as well:
self._cache['props'][property_name].

Will just leave as-is for now.

[jbudorick, 2015/08/11 13:53:18]

Hmm, good point.
sgtm

+    if cache_key in self._cache:
+      del self._cache[cache_key]
     # TODO(perezju) remove the option and make the check mandatory, but using a
     # single shell script to both set- and getprop.
     if check and value != self.GetProp(property_name):
       raise device_errors.CommandFailedError(
           'Unable to set property %r on the device to %r'
           % (property_name, value), str(self))
 
   @decorators.WithTimeoutAndRetriesFromInstance()
   def GetABI(self, timeout=None, retries=None):
     """Gets the device main ABI.
@@ skipping 224 matching lines @@
   def HealthyDevices(cls):
     blacklist = device_blacklist.ReadBlacklist()
     def blacklisted(adb):
       if adb.GetDeviceSerial() in blacklist:
         logging.warning('Device %s is blacklisted.', adb.GetDeviceSerial())
         return True
       return False
 
     return [cls(adb) for adb in adb_wrapper.AdbWrapper.Devices()
             if not blacklisted(adb)]