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 3660 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()
+    PyUITest.setUp(self)

[Nirnimesh, 2012/03/03 01:24:15]

why?

[frankf, 2012/03/03 01:54:13]

I don't want Logout() to call the derived class's setUp(). PolicyTestBase's
setUp() setups a test server and logs you back in. I haven't fully tested this
CL yet, so assumption may be wrong in other scenarios (e.g. chromeos_login)

On 2012/03/03 01:24:15, Nirnimesh wrote:

[dtu, 2012/03/03 02:14:41]

The intent in Logout() and Signout() is to do only the ChromeOS-specific testing
channel setup, not the test-specific setup from when a test overrides setUp(). I
would prefer if the ChromeOS-specific stuff is pulled out to its own method to
make this distinction clearer, but this is okay too.

[Nirnimesh, 2012/03/03 02:22:01]

Makes sense.

[frankf, 2012/03/03 03:48:05]

Agree. Now we have setUp(), SetUp(), __SetUp()
:)

On 2012/03/03 02:14:41, Dave Tu wrote:

 
   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()
+    PyUITest.setUp(self)
 
   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()