diff options
| author | qghc36@motorola.com <qghc36@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 04:18:42 +0000 |
|---|---|---|
| committer | qghc36@motorola.com <qghc36@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 04:18:42 +0000 |
| commit | 8e85ddccb4f3c251420292f9777c150bbe9df672 (patch) | |
| tree | 76e5a9e84d98ae2b9c8c3997f1d94d0457816ac5 /base | |
| parent | 2e1f57c881485f5f88ff8b021d87175b0d9b6caf (diff) | |
| download | chromium_src-8e85ddccb4f3c251420292f9777c150bbe9df672.zip chromium_src-8e85ddccb4f3c251420292f9777c150bbe9df672.tar.gz chromium_src-8e85ddccb4f3c251420292f9777c150bbe9df672.tar.bz2 | |
Fixed ProcessUtilTest.GetTerminationStatusCrash for android. Increased the timeout required to check the termination status of the process.
BUG=145447
Review URL: https://chromiumcodereview.appspot.com/10890031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 3368d5e..6eccb90 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -104,7 +104,12 @@ base::TerminationStatus WaitForChildTermination(base::ProcessHandle handle, base::PlatformThread::Sleep(kInterval); waited += kInterval; } while (status == base::TERMINATION_STATUS_STILL_RUNNING && +// Waiting for more time for process termination on android devices. +#if defined(OS_ANDROID) + waited < TestTimeouts::large_test_timeout()); +#else waited < TestTimeouts::action_max_timeout()); +#endif return status; } |