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

Unified Diff: chrome/test/functional/downloads.py

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/functional/downloads.py
===================================================================
--- chrome/test/functional/downloads.py (revision 79305)
+++ chrome/test/functional/downloads.py (working copy)
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -216,9 +216,8 @@
self.DownloadAndWaitForStart(file_url)
self._DeleteAfterShutdown(downloaded_pkg)
# Waiting for big file to download might exceed automation timeout.
Paweł Hajdan Jr. 2011/03/29 18:57:54 nit: IMHO those two comment lines can now be remov
Nirnimesh 2011/03/29 20:27:28 Yes, it'd be fine to remove these comments
Huyen 2011/03/31 02:42:55 Done.
- # Temporarily increase the automation timeout.
- test_utils.CallFunctionWithNewTimeout(self, 4 * 60 * 1000, # 4 min.
- self.WaitForAllDownloadsToComplete)
+ # Increase timeout to large_test_timeout_ms.
+ self.WaitForAllDownloadsToComplete(timeout=self.large_test_timeout_ms());
Nirnimesh 2011/03/29 20:27:28 What's the value of large_test_timeout_ms?
Huyen 2011/03/31 02:42:55 3 minutes. Running ui_tests and downloads.py this
# Verify that the file was correctly downloaded
self.assertTrue(os.path.exists(downloaded_pkg),
'Downloaded file %s missing.' % downloaded_pkg)
@@ -361,9 +360,8 @@
self.assertFalse(resume_dict['is_paused'])
# Waiting for big file to download might exceed automation timeout.
- # Temporarily increase the automation timeout.
- test_utils.CallFunctionWithNewTimeout(self, 2 * 60 * 1000, # 2 min.
- self.WaitForAllDownloadsToComplete)
+ # Increase timeout to large_test_timeout_ms.
+ self.WaitForAllDownloadsToComplete(timeout=self.large_test_timeout_ms());
# Verify that the file was correctly downloaded after pause and resume.
self.assertTrue(os.path.exists(downloaded_pkg),

Powered by Google App Engine
This is Rietveld 408576698