summaryrefslogtreecommitdiffstats
path: root/components/test
diff options
context:
space:
mode:
authormelandory <melandory@chromium.org>2015-05-19 03:11:58 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-19 10:12:03 +0000
commitf0d41ff457719264be0af4071ff3c05e2e8e13d1 (patch)
treeff34362087e550f05304a8a75de1274b4c70c485 /components/test
parent0ea1107bf2c1a0532d1c10a3666cafb9047abbb6 (diff)
downloadchromium_src-f0d41ff457719264be0af4071ff3c05e2e8e13d1.zip
chromium_src-f0d41ff457719264be0af4071ff3c05e2e8e13d1.tar.gz
chromium_src-f0d41ff457719264be0af4071ff3c05e2e8e13d1.tar.bz2
[Password manager tests automation] Fix automated tests runner.
Fix error introduced while adressing comments in https://codereview.chromium.org/1089383002/ BUG=369521 R=vabr@chromium.org Review URL: https://codereview.chromium.org/1134843005 Cr-Commit-Position: refs/heads/master@{#330501}
Diffstat (limited to 'components/test')
-rw-r--r--components/test/data/password_manager/automated_tests/run_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/test/data/password_manager/automated_tests/run_tests.py b/components/test/data/password_manager/automated_tests/run_tests.py
index 7a054a5..f64a261 100644
--- a/components/test/data/password_manager/automated_tests/run_tests.py
+++ b/components/test/data/password_manager/automated_tests/run_tests.py
@@ -129,8 +129,10 @@ def RunTestCaseOnWebsite((website, test_case, config)):
result = tests.RunTest(config.chrome_path, config.chromedriver_path,
profile_path, config.passwords_path,
website, test_case)[0]
- if timeout != timeout.EXECUTED:
- result = (website, test_case, False, "Timeout")
+ if timeout.state != timeout.EXECUTED:
+ result = (website, test_case, False,
+ "Got %d as timeout state (see stopit.ThreadingTimeout for"
+ "the meaning of the number)" % timeout.state)
_, _, success, _ = result
if success:
return result