PyAuto tests derived from PolicyTestBase now clear the profile.

chrome/test/pyautolib/pyauto.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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 150 matching lines @@
       if flag.startswith('--'):
         flag = flag[2:]
       split_pos = flag.find('=')
       if split_pos >= 0:
         flag_name = flag[:split_pos]
         flag_val = flag[split_pos + 1:]
         self.AppendBrowserLaunchSwitch(flag_name, flag_val)
       else:
         self.AppendBrowserLaunchSwitch(flag)
 
-  def setUp(self):
-    """Override this method to launch browser differently.
-
-    Can be used to prevent launching the browser window by default in case a
-    test wants to do some additional setup before firing browser.
-
-    When using the named interface, it connects to an existing browser
-    instance.
-    """
+  def __SetUp(self):
     named_channel_id = None
     if _OPTIONS:
       named_channel_id = _OPTIONS.channel_id
     if self.IsChromeOS():  # Enable testing interface on ChromeOS.
       if self.get_clear_profile():
         self.CleanupBrowserProfileOnChromeOS()
       self.EnableCrashReportingOnChromeOS()
       if not named_channel_id:
         named_channel_id = self.EnableChromeTestingOnChromeOS()
     else:
@@ skipping 15 matching lines @@
     # TODO(dtu): Remove this after crosbug.com/4558 is fixed.
     if self.IsChromeOS():
       self.WaitUntil(lambda: not self.GetNetworkInfo()['offline_mode'])
 
     # If we are connected to any RemoteHosts, create PyAuto
     # instances on the remote sides and set them up too.
     for remote in self.remotes:
       remote.CreateTarget(self)
       remote.setUp()
 
+  def setUp(self):
+    """Override this method to launch browser differently.
+
+    Can be used to prevent launching the browser window by default in case a
+    test wants to do some additional setup before firing browser.
+
+    When using the named interface, it connects to an existing browser
+    instance.
+    """
+    self.__SetUp()
+
   def tearDown(self):
     for remote in self.remotes:
       remote.tearDown()
 
     self.TearDown()  # Destroy browser
 
   # Method required by the Python standard library unittest.TestCase.
   def runTest(self):
     pass
 
@@ skipping 3445 matching lines @@
 
     May return before logout is complete and
     gives no indication of success or failure.
     Should be logged in to work.
     """
     assert self.GetLoginInfo()['is_logged_in'], \
         'Trying to log out when already logged out.'
     assert self.WaitForSessionManagerRestart(
         lambda: self.ApplyAccelerator(IDC_EXIT)), \
         'Session manager did not restart after logout.'
-
-    self.setUp()
+    self.__SetUp()
 
   def LockScreen(self):
     """Locks the screen on chromeos.
 
     Waits until screen is locked.
     Should be logged in and screen should not be locked to work.
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
@@ skipping 27 matching lines @@
     Effectively the same as clicking the "Sign out" link on the screen locker.
     Screen should be locked for this to work.
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = { 'command': 'SignoutInScreenLocker' }
     assert self.WaitForSessionManagerRestart(
         lambda: self._GetResultFromJSONRequest(cmd_dict, windex=None)), \
         'Session manager did not restart after logout.'
-    self.setUp()
+    self.__SetUp()
 
   def GetBatteryInfo(self):
     """Get details about battery state.
 
     Returns:
       A dictionary with the following keys:
 
       'battery_is_present': bool
       'line_power_on': bool
       if 'battery_is_present':
@@ skipping 1307 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()