Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: chrome/test/perf/dom_checker_uitest.cc

Issue 7744031: Remove obsolete test timeouts and convert callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/live_sync/live_sync_test.cc ('k') | chrome/test/perf/dromaeo_benchmark_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 &expected_failures_text); 138 &expected_failures_text);
139 if (!have_expected_results) 139 if (!have_expected_results)
140 return false; 140 return false;
141 ParseExpectedFailures(expected_failures_text, expected_failures); 141 ParseExpectedFailures(expected_failures_text, expected_failures);
142 return true; 142 return true;
143 } 143 }
144 144
145 bool WaitUntilTestCompletes(TabProxy* tab) { 145 bool WaitUntilTestCompletes(TabProxy* tab) {
146 return WaitUntilJavaScriptCondition(tab, L"", 146 return WaitUntilJavaScriptCondition(tab, L"",
147 L"window.domAutomationController.send(automation.IsDone());", 147 L"window.domAutomationController.send(automation.IsDone());",
148 TestTimeouts::huge_test_timeout_ms()); 148 TestTimeouts::large_test_timeout_ms());
149 } 149 }
150 150
151 bool GetTestCount(TabProxy* tab, int* test_count) { 151 bool GetTestCount(TabProxy* tab, int* test_count) {
152 return tab->ExecuteAndExtractInt(L"", 152 return tab->ExecuteAndExtractInt(L"",
153 L"window.domAutomationController.send(automation.GetTestCount());", 153 L"window.domAutomationController.send(automation.GetTestCount());",
154 test_count); 154 test_count);
155 } 155 }
156 156
157 bool GetTestsFailed(TabProxy* tab, ResultsSet* tests_failed) { 157 bool GetTestsFailed(TabProxy* tab, ResultsSet* tests_failed) {
158 std::wstring json_wide; 158 std::wstring json_wide;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 TEST_F(DomCheckerTest, FAILS_Http) { 244 TEST_F(DomCheckerTest, FAILS_Http) {
245 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest)) 245 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
246 return; 246 return;
247 247
248 ResultsList new_passes, new_failures; 248 ResultsList new_passes, new_failures;
249 RunTest(true, &new_passes, &new_failures); 249 RunTest(true, &new_passes, &new_failures);
250 PrintResults(new_passes, new_failures); 250 PrintResults(new_passes, new_failures);
251 } 251 }
252 252
253 } // namespace 253 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/live_sync/live_sync_test.cc ('k') | chrome/test/perf/dromaeo_benchmark_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698