Mitigate race caused by flimflam restart in CleanFlimflamDirs()

chrome/test/functional/chromeos_onc.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.
 
 import os
 
 import pyauto_functional  # must come before pyauto.
 import policy_base
 import pyauto
 
 
 class ChromeosONC(policy_base.PolicyTestBase):
   """
   Tests for Open Network Configuration (ONC).
 
   Open Network Configuration (ONC) files is a json dictionary
   that contains network configurations and is pulled via policies.
   These tests verify that ONC files that are formatted correctly
   add the network/certificate to the device.
   """
 
   ONC_PATH = os.path.join(pyauto.PyUITest.DataDir(), 'chromeos', 'cros')
 
   def setUp(self):
+    self.CleanupFlimflamDirsOnChromeOS()
     policy_base.PolicyTestBase.setUp(self)
-    self.CleanupFlimflamDirsOnChromeOS()
     self.LoginWithTestAccount()
 
   def _ReadONCFileAndSet(self, filename):
     """Reads the specified ONC file and sends it as a policy.
 
     Inputs:
       filename: The filename of the ONC file.  ONC files should
                 all be stored in the path defined by ONC_PATH.
     """
     with open(os.path.join(self.ONC_PATH, filename)) as fp:
@@ skipping 50 matching lines @@
 
   def testONCAddPSKWifi(self):
     """Test adding WPA network."""
     wifi_networks = {
         'ssid-wpa': 'PSK',
     }
     self._ReadONCFileAndSet('network-wifi-wpa.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddBacktoBackONC(self):
-    """Test adding three different ONC files one after the other."""
+    """Test adding three different ONC files one after the other.
+
+    TODO(stanleyw): crosbug.com/29422 This test checks for buggy behavior that
+    has since been fiex in crosbug.com/27862.
+    """
     wifi_networks = {
         'ssid-none': '',
         'ssid-wep': 'WEP',
         'ssid-wpa': 'PSK',
     }
 
     self._ReadONCFileAndSet('network-wifi-none.onc')
     self._ReadONCFileAndSet('network-wifi-wep.onc')
     self._ReadONCFileAndSet('network-wifi-wpa.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddONCWithUnknownFields(self):
     """Test adding an ONC file with unknown fields."""
     wifi_networks = {
         'ssid-none': '',
         'ssid-wpa': 'PSK'
     }
 
     self._ReadONCFileAndSet('network-multiple-unknown.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()