Index: chrome/test/pyautolib/pyauto.py |
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py |
index 959ca457e330ad9991f26edce9d3108f41e37e78..98399e8d1f3d492262a9d453fbc666bf68762595 100755 |
--- a/chrome/test/pyautolib/pyauto.py |
+++ b/chrome/test/pyautolib/pyauto.py |
@@ -168,15 +168,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): |
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 |
@@ -212,6 +204,17 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): |
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() |
@@ -3677,8 +3680,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): |
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. |
@@ -3726,7 +3728,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): |
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. |