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

Side by Side Diff: chrome/test/ui/ui_test.cc

Issue 3044007: Set url fetch test timeout back to old values. Increase UI test command timeo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: cleanup Created 10 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/test/ui/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #if defined(OS_POSIX) 7 #if defined(OS_POSIX)
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #endif 10 #endif
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 49
50 using base::Time; 50 using base::Time;
51 using base::TimeDelta; 51 using base::TimeDelta;
52 using base::TimeTicks; 52 using base::TimeTicks;
53 53
54 // Delay to let browser complete a requested action. 54 // Delay to let browser complete a requested action.
55 static const int kWaitForActionMsec = 2000; 55 static const int kWaitForActionMsec = 2000;
56 static const int kWaitForActionMaxMsec = 15000; 56 static const int kWaitForActionMaxMsec = 15000;
57 // Command execution timeout passed to AutomationProxy. 57 // Command execution timeout passed to AutomationProxy.
58 static const int kCommandExecutionTimeout = 15000; 58 static const int kCommandExecutionTimeout = 25000;
59 // Delay to let the browser shut down before trying more brutal methods. 59 // Delay to let the browser shut down before trying more brutal methods.
60 static const int kWaitForTerminateMsec = 15000; 60 static const int kWaitForTerminateMsec = 15000;
61 // Passed as value of kTestType. 61 // Passed as value of kTestType.
62 static const char kUITestType[] = "ui"; 62 static const char kUITestType[] = "ui";
63 63
64 const wchar_t UITestBase::kFailedNoCrashService[] = 64 const wchar_t UITestBase::kFailedNoCrashService[] =
65 #if defined(OS_WIN) 65 #if defined(OS_WIN)
66 L"NOTE: This test is expected to fail if crash_service.exe is not " 66 L"NOTE: This test is expected to fail if crash_service.exe is not "
67 L"running. Start it manually before running this test (see the build " 67 L"running. Start it manually before running this test (see the build "
68 L"output directory)."; 68 L"output directory).";
(...skipping 1457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 set_ui_test_name(ASCIIToWide(test_name)); 1526 set_ui_test_name(ASCIIToWide(test_name));
1527 } 1527 }
1528 UITestBase::SetUp(); 1528 UITestBase::SetUp();
1529 PlatformTest::SetUp(); 1529 PlatformTest::SetUp();
1530 } 1530 }
1531 1531
1532 void UITest::TearDown() { 1532 void UITest::TearDown() {
1533 UITestBase::TearDown(); 1533 UITestBase::TearDown();
1534 PlatformTest::TearDown(); 1534 PlatformTest::TearDown();
1535 } 1535 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698