tools/testing/run_selenium.py - Issue 11098028: Revert r13442. The extension fails to install under Windows, and the sentinel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/testing/run_selenium.py

Issue 11098028: Revert r13442. The extension fails to install under Windows, and the sentinel (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tools/testing/run_selenium.py

===================================================================

--- tools/testing/run_selenium.py (revision 13447)

+++ tools/testing/run_selenium.py (working copy)

@@ -141,23 +141,15 @@

def start_browser(browser, executable_path, html_out):

if browser == 'chrome':

- script_dir = os.path.dirname(os.path.abspath(__file__))

- crx = os.path.join(script_dir, 'extensions', 'chrome',

- 'ConsoleCollector.crx')

- options = selenium.webdriver.chrome.options.Options()

- options.add_extension(crx)

# Note: you need ChromeDriver *in your path* to run Chrome, in addition to

# installing Chrome. Also note that the build bot runs have a different path

# from a normal user -- check the build logs.

- return selenium.webdriver.Chrome(chrome_options=options)

+ return selenium.webdriver.Chrome()

elif browser == 'dartium':

script_dir = os.path.dirname(os.path.abspath(__file__))

dartium_dir = os.path.join(script_dir, '..', '..', 'client', 'tests',

'dartium')

- crx = os.path.join(script_dir, 'extensions', 'chrome',

- 'ConsoleCollector.crx')

options = selenium.webdriver.chrome.options.Options()

- options.add_extension(crx)

# enable ShadowDOM and style scoped for Dartium

options.add_argument('--enable-shadow-dom')

options.add_argument('--enable-style-scoped')

@@ -178,8 +170,7 @@

profile.set_preference('dom.max_chrome_script_run_time', 0)

profile.set_preference('app.update.auto', True)

profile.set_preference('app.update.enabled', True)

- xpi = os.path.join(script_dir, 'extensions', 'firefox',

- 'ConsoleCollector.xpi')

+ xpi = os.path.join(script_dir, 'extensions', 'firefox', 'ConsoleCollector.xpi')

profile.add_extension(xpi);

return selenium.webdriver.Firefox(firefox_profile=profile)

elif browser == 'ie' and platform.system() == 'Windows':

@@ -253,16 +244,12 @@

index += len('<body>')

end_index = source.find('</body')

print unicode(source[index : end_index]).encode("utf-8")

- logs = []

if type(browser) is selenium.webdriver.firefox.webdriver.WebDriver:

logs = browser.execute_script("return window.ConsoleCollector.read()");

- elif type(browser) is selenium.webdriver.chrome.webdriver.WebDriver:

- browser.set_script_timeout(100)

- logs = browser.execute_async_script(

- "getMessages(arguments[arguments.length-1])");

- for msg in logs:

- print('%s:%s:%s %s' %(

- msg['source'], msg['line'], msg['category'], msg['message']))

+ for msg in logs:

+ print('%s:%s:%s:%s %s' %(

+ msg['source'], msg['line'], msg['column'],

+ msg['category'], msg['message']))

return 1

« no previous file with comments | « pkg/unittest/test_controller.js ('k') | no next file » | no next file with comments »