Skip to content

Commit 9e16282

Browse files
committed
Merge branch 'close-browser-on-failed-open'
2 parents bbf3efe + 21829ec commit 9e16282

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/Selenium2Library/keywords/_browsermanagement.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,13 @@ def open_browser(self, url, browser='firefox', alias=None,remote_url=False,
111111
self._info("Opening browser '%s' to base url '%s'" % (browser, url))
112112
browser_name = browser
113113
browser = self._make_browser(browser_name,desired_capabilities,ff_profile_dir,remote_url)
114-
browser.get(url)
114+
try:
115+
browser.get(url)
116+
except:
117+
self._cache.register(browser, alias)
118+
self._debug("Opened browser with session id %s but failed to open url '%s'"
119+
% (browser.session_id, url))
120+
raise
115121
self._debug('Opened browser with session id %s'
116122
% browser.session_id)
117123
return self._cache.register(browser, alias)

test/acceptance/open_and_close.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,14 @@ There Should Be A Good Error Message If Browser Is Not Opened
1717

1818
Close Browser Does Nothing When No Browser Is Opened
1919
Close Browser
20+
21+
Browser Open With Not Well-Formed URL Should Close
22+
[Documentation] Verify after incomplete 'Open Browser' browser closes
23+
... LOG 1.1:10 DEBUG STARTS: Opened browser with session id
24+
... LOG 1.1:10 DEBUG REGEXP: .*but failed to open url.*
25+
... LOG 2:2 DEBUG STARTS: DELETE
26+
... LOG 2:3 DEBUG Finished Request
27+
28+
Run Keyword And Expect Error *
29+
... Open Browser bad.url.bad ${BROWSER}
30+
Close All Browsers

0 commit comments

Comments
 (0)