diff options
author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 17:58:38 +0000 |
---|---|---|
committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 17:58:38 +0000 |
commit | 21c4827b3846bc3933be89dabbaefd41e6361ca3 (patch) | |
tree | 47bed66db08a22f93c94cc293181155b10a42641 | |
parent | d6dac64db3f5f90e3cfc65d33f98db325656fb6d (diff) | |
download | chromium_src-21c4827b3846bc3933be89dabbaefd41e6361ca3.zip chromium_src-21c4827b3846bc3933be89dabbaefd41e6361ca3.tar.gz chromium_src-21c4827b3846bc3933be89dabbaefd41e6361ca3.tar.bz2 |
Fix chromedriver shutdown tests.
BUG=none
TEST=none
TBR=hnguyen
Review URL: http://codereview.chromium.org/8729038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111966 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/test/webdriver/test/chromedriver_tests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/webdriver/test/chromedriver_tests.py b/chrome/test/webdriver/test/chromedriver_tests.py index 5feeabc..175c20b 100644 --- a/chrome/test/webdriver/test/chromedriver_tests.py +++ b/chrome/test/webdriver/test/chromedriver_tests.py @@ -422,7 +422,7 @@ class ShutdownTest(ChromeDriverTest): def setUp(self): super(ShutdownTest, self).setUp() self._custom_server = ChromeDriverLauncher(self.GetDriverPath()).Launch() - self._custom_factory = ChromeDriverFactory(self.custom_server, + self._custom_factory = ChromeDriverFactory(self._custom_server, self.GetChromePath()) def tearDown(self): @@ -430,26 +430,26 @@ class ShutdownTest(ChromeDriverTest): super(ShutdownTest, self).tearDown() def testShutdownWithSession(self): - driver = self.custom_factory.GetNewDriver() - driver.get(self.custom_server.GetUrl() + '/status') + driver = self._custom_factory.GetNewDriver() + driver.get(self._custom_server.GetUrl() + '/status') driver.find_element_by_tag_name('body') - self.custom_server.Kill() + self._custom_server.Kill() def testShutdownWithBusySession(self): def _Hang(driver): """Waits for the process to quit and then notifies.""" try: - driver.get(self.custom_server.GetUrl() + '/hang') + driver.get(self._custom_server.GetUrl() + '/hang') except httplib.BadStatusLine: pass - driver = self.custom_factory.GetNewDriver() + driver = self._custom_factory.GetNewDriver() wait_thread = threading.Thread(target=_Hang, args=(driver,)) wait_thread.start() wait_thread.join(5) self.assertTrue(wait_thread.isAlive()) - self.custom_server.Kill() + self._custom_server.Kill() wait_thread.join(10) self.assertFalse(wait_thread.isAlive()) |