Move up flimflam cleanup

chrome/test/pyautolib/chromeos_network.py

 # 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 copy
 import dbus
 import logging
 import os
 import time
 
@@ skipping 116 matching lines @@
   """
   _ROUTER_CONFIG_FILE = os.path.join(pyauto.PyUITest.DataDir(),
                                      'pyauto_private', 'chromeos', 'network',
                                      'wifi_testbed_config')
   _FLIMFLAM_PATH = 'org.chromium.flimflam'
 
   def setUp(self):
     # Move ethernet to the end of the flimflam priority list,
     # effectively hiding any ssh connections that the
     # test harness might be using and putting wifi ahead.
+    self.CleanupFlimflamDirsOnChromeOS()

[Nirnimesh, 2012/08/15 22:35:02]

Move it before the comment.

     self._PushServiceOrder('wifi,ethernet')
     self._ParseDefaultRoutingTable()
     pyauto.PyUITest.setUp(self)
-    self.CleanupFlimflamDirsOnChromeOS()
     self.ForgetAllRememberedNetworks()
     self._wifi_power_strip = None
 
   def tearDown(self):
     self.ForgetAllRememberedNetworks()
     pyauto.PyUITest.tearDown(self)
     self._PopServiceOrder()
     if self._wifi_power_strip:
       self._wifi_power_strip.TurnOffUsedRouters()
     # Remove the route entry for the power strip.
@@ skipping 122 matching lines @@
     else:
       service_path = self.GetServicePath(router['ssid'])
       assert service_path, 'Service with SSID %s is not present.' % \
              router['ssid']
 
       logging.debug('Connecting to router %s.' % router_name)
       error_string = self.ConnectToWifiNetwork(service_path,
                                                password=passphrase,
                                                shared=shared)
     return error_string