summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional/downloads.py
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/functional/downloads.py')
-rw-r--r--chrome/test/functional/downloads.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/functional/downloads.py b/chrome/test/functional/downloads.py
index 5ec5484..1af21c8 100644
--- a/chrome/test/functional/downloads.py
+++ b/chrome/test/functional/downloads.py
@@ -200,8 +200,12 @@ class DownloadsTest(pyauto.PyUITest):
self.DownloadAndWaitForStart(file_url)
# Waiting for big file to download might exceed automation timeout.
# Temporarily increase the automation timeout.
- self._CallFunctionWithNewTimeout(4 * 60 * 1000, # 4 min.
- self.WaitForAllDownloadsToComplete)
+
+ # Temp workaround for crbug.com/54131
+ # self._CallFunctionWithNewTimeout(4 * 60 * 1000, # 4 min.
+ # self.WaitForAllDownloadsToComplete)
+ self.WaitForAllDownloadsToComplete(timeout=4*60*1000)
+ # -- End workaround
# Verify that the file was correctly downloaded
self.assertTrue(os.path.exists(downloaded_pkg),
'Downloaded file %s missing.' % downloaded_pkg)