Mitigate race caused by flimflam restart in CleanFlimflamDirs()

chrome/test/pyautolib/chromeos/suid_actions.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Helper script to perform actions as a super-user on ChromeOS.
 
 Needs to be run with superuser privileges, typically using the
 suid_python binary.
 
@@ skipping 26 matching lines @@
     self._ParseArgs()
     assert os.geteuid() == 0, 'Needs superuser privileges.'
     handler = getattr(self, self._options.action)
     assert handler and callable(handler), \
         'No handler for %s' % self._options.action
     handler()
     return 0
 
   ## Actions ##
   def CleanFlimflamDirs(self):
-    """Clean the contents of all flimflam profiles."""
+    """Clean the contents of all flimflam profiles.
+
+    TODO(stanleyw): crosbug.com/29421 This method restarts flimflam. It should
+    wait until flimflam is fully initialized and accessible via DBus. Otherwise,
+    there is a race conditions and subsequent accesses to flimflam may fail.
+    """
     flimflam_dirs = ['/home/chronos/user/flimflam',
                      '/var/cache/flimflam']
     os.system('stop flimflam')
     try:
       for flimflam_dir in flimflam_dirs:
         if not os.path.exists(flimflam_dir):
           continue
         for item in os.listdir(flimflam_dir):
           path = os.path.join(flimflam_dir, item)
           if os.path.isdir(path):
             shutil.rmtree(path)
           else:
             os.remove(path)
     finally:
       os.system('start flimflam')
 
   def RemoveAllCryptohomeVaults(self):
     """Remove any existing cryptohome vaults."""
     cryptohome.remove_all_vaults()
 
 
 if __name__ == '__main__':
   sys.exit(SuidAction().Run())