dart/tools/testing/run_selenium.py - Issue 11093019: Revert "Experiment: revert parts of r13318."

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: dart/tools/testing/run_selenium.py

Issue 11093019: Revert "Experiment: revert parts of r13318." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge

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: dart/tools/testing/run_selenium.py

diff --git a/dart/tools/testing/run_selenium.py b/dart/tools/testing/run_selenium.py

index 85113656ab994e05ff68ba44b4f3b6980775853c..ef543317bbacfbcab04dd93e6b11955b1442b400 100755

--- a/dart/tools/testing/run_selenium.py

+++ b/dart/tools/testing/run_selenium.py

@@ -164,11 +164,14 @@ def start_browser(browser, executable_path, html_out):

options.binary_location = os.path.join(dartium_dir, 'chrome')

return selenium.webdriver.Chrome(chrome_options=options)

elif browser == 'ff':

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

profile = selenium.webdriver.firefox.firefox_profile.FirefoxProfile()

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

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')

+ profile.add_extension(xpi);

return selenium.webdriver.Firefox(firefox_profile=profile)

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

return selenium.webdriver.Ie()

@@ -220,7 +223,7 @@ def close_browser(browser):

# TODO(efortuna): Figure out why this crashes.... and avoid?

pass

-def report_results(mode, source):

+def report_results(mode, source, browser):

# TODO(vsm): Add a failure check for Dromaeo.

if mode != 'correctness':

# We're running a performance test.

@@ -244,6 +247,12 @@ def report_results(mode, source):

index += len('<body>')

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

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

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

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

+ for msg in logs:

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

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

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

return 1

@@ -307,7 +316,7 @@ def run_batch_tests():

# print one of:

# >>> TEST {PASS, FAIL, OK, CRASH, FAIL, TIMEOUT}

- status = report_results(mode, source)

+ status = report_results(mode, source, browser)

if status == 0:

print '>>> TEST PASS'

elif source == TIMEOUT_ERROR_MSG:

@@ -332,7 +341,7 @@ def main(args):

try:

output = run_test_in_browser(browser, html_out, timeout, mode)

- return report_results(mode, output)

+ return report_results(mode, output, browser)

finally:

close_browser(browser)

« no previous file with comments | « no previous file | no next file » | no next file with comments »