diff options
| author | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 19:13:12 +0000 |
|---|---|---|
| committer | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 19:13:12 +0000 |
| commit | 7328a309956e1ba698bcb007e0afc210a6c0d69f (patch) | |
| tree | 19620cb44a79426fddd6becd9fc69cdb0ccf3f38 /tools/valgrind/chrome_tests.py | |
| parent | b04cacb54853b3269a64585815d20417f12c579f (diff) | |
| download | chromium_src-7328a309956e1ba698bcb007e0afc210a6c0d69f.zip chromium_src-7328a309956e1ba698bcb007e0afc210a6c0d69f.tar.gz chromium_src-7328a309956e1ba698bcb007e0afc210a6c0d69f.tar.bz2 | |
Pass in right parameter for safe_browsing valgrind test on trybot.
Test=safe_browsing_tests green on valgrind (and actually runs!)
BUG=68239
Review URL: http://codereview.chromium.org/6009012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index f4a7c4c..bb36adb 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -240,10 +240,6 @@ class ChromeTests: "--ui-test-action-timeout=120000", "--ui-test-action-max-timeout=280000"]) - def TestSafeBrowsing(self): - return self.SimpleTest("chrome", "safe_browsing_tests", - cmd_args=["--test-terminate-timeout=40000"]) - def TestIpc(self): return self.SimpleTest("ipc", "ipc_tests", valgrind_test_args=["--trace_children"]) @@ -303,6 +299,11 @@ class ChromeTests: cmd_args=(self.UI_TEST_ARGS + ["--list=%s" % url_list_file])) + def TestSafeBrowsing(self): + return self.SimpleTest("chrome", "safe_browsing_tests", + valgrind_test_args=self.UI_VALGRIND_ARGS, + cmd_args=(["--test-terminate-timeout=900000"])) + def TestSync(self): return self.SimpleTest("chrome", "sync_unit_tests") |