mojo/devtools/common/devtoolslib/apptest_gtest.py - Issue 1266623002: Impose max running time for apptests.

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: mojo/devtools/common/devtoolslib/apptest_gtest.py

Issue 1266623002: Impose max running time for apptests. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Indicate time unit when printing out the time out value. Created 5 years, 5 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:

Index: mojo/devtools/common/devtoolslib/apptest_gtest.py

diff --git a/mojo/devtools/common/devtoolslib/apptest_gtest.py b/mojo/devtools/common/devtoolslib/apptest_gtest.py

index 5308f096fc587989c5076b22eb2896b7cca35d14..4515e896751484a8c85c2a4e7eead469bda33608 100644

--- a/mojo/devtools/common/devtoolslib/apptest_gtest.py

+++ b/mojo/devtools/common/devtoolslib/apptest_gtest.py

@@ -25,7 +25,8 @@ def _gtest_apptest_output_test(output):

return True

-def run_gtest_apptest(shell, shell_args, apptest_url, apptest_args, isolate):

+def run_gtest_apptest(shell, shell_args, apptest_url, apptest_args, timeout,

+ isolate):

"""Runs a gtest apptest.

Args:

@@ -41,7 +42,7 @@ def run_gtest_apptest(shell, shell_args, apptest_url, apptest_args, isolate):

"""

if not isolate:

- return run_apptest(shell, shell_args, apptest_url, apptest_args,

+ return run_apptest(shell, shell_args, apptest_url, apptest_args, timeout,

_gtest_apptest_output_test)

# List the apptest fixtures so they can be run independently for isolation.

@@ -54,7 +55,7 @@ def run_gtest_apptest(shell, shell_args, apptest_url, apptest_args, isolate):

for fixture in fixtures:

isolated_apptest_args = apptest_args + ["--gtest_filter=%s" % fixture]

success = run_apptest(shell, shell_args, apptest_url, isolated_apptest_args,

- _gtest_apptest_output_test)

+ timeout, _gtest_apptest_output_test)

if not success:

apptest_result = False

@@ -78,8 +79,8 @@ def get_fixtures(shell, shell_args, apptest):

arguments.append("--args-for=%s %s" % (apptest, "--gtest_list_tests"))

arguments.append(apptest)

- (exit_code, output) = shell.RunAndGetOutput(arguments)

- if exit_code:

+ (exit_code, output, did_time_out) = shell.RunAndGetOutput(arguments)

+ if exit_code or did_time_out:

command_line = "mojo_shell " + " ".join(["%r" % x for x in arguments])

print "Failed to get test fixtures: %r" % command_line

print 72 * '-'