Fix for flakiness in pyauto automation hook WaitForDownloadsToComplete.

chrome/test/functional/downloads.py

 #!/usr/bin/python
 # 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.
 
 import commands
 import filecmp
 import logging
 import os
 import shutil
@@ skipping 118 matching lines @@
     """Download and verify a zip in incognito window."""
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
     file_path = os.path.join(test_dir, 'a_zip_file.zip')
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   'a_zip_file.zip')
     self._ClearLocalDownloadState(downloaded_pkg)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
 
     # Trigger download and wait in new incognito window.
-    self.DownloadAndWaitForStart(file_url, 1)
-    self.WaitForAllDownloadsToComplete(1)
-    # Remove next line when WaitForAllDownloadsToComplete can reliably wait
-    # for downloads in incognito window. crbug.com/69738
-    self.WaitForDownloadToComplete(downloaded_pkg)
+    self.DownloadAndWaitForStart(file_url, windex=1)
+    self.WaitForAllDownloadsToComplete(windex=1)
     incognito_downloads = self.GetDownloadsInfo(1).Downloads()
 
     # Verify that download info exists in the correct profile.
     self.assertEqual(len(incognito_downloads), 1)
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg),
         msg='%s (size %d) and %s (size %d) do not match' % (
             file_path, os.path.getsize(file_path),
             downloaded_pkg, os.path.getsize(downloaded_pkg)))
     self.assertTrue(self.IsDownloadShelfVisible(1))
 
   def testSaveDangerousFile(self):
     """Verify that we can download and save a dangerous file."""
     file_path = self._GetDangerousDownload()
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
     self._TriggerUnsafeDownload(os.path.basename(file_path))
     self.PerformActionOnDownload(self._GetDownloadId(),
                                  'save_dangerous_download')
-    self.WaitForDownloadToComplete(downloaded_pkg)
+    self.WaitForAllDownloadsToComplete()
 
     # Verify that the file was downloaded.
     self.assertTrue(os.path.exists(downloaded_pkg))
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg))
     self._DeleteAfterShutdown(downloaded_pkg)
 
   def testDeclineDangerousDownload(self):
     """Verify that we can decline dangerous downloads"""
     file_path = self._GetDangerousDownload()
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
     self._TriggerUnsafeDownload(os.path.basename(file_path))
     self.PerformActionOnDownload(self._GetDownloadId(),
                                  'decline_dangerous_download')
     self.assertFalse(os.path.exists(downloaded_pkg))
     self.assertFalse(self.GetDownloadsInfo().Downloads())
     self.assertFalse(self.IsDownloadShelfVisible())
 
   def testRemoveDownload(self):
     """Verify that we can remove a download."""
     file_url = self.GetFileURLForDataPath('downloads', 'a_zip_file.zip')
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   'a_zip_file.zip')
     self._ClearLocalDownloadState(downloaded_pkg)
 
     self.DownloadAndWaitForStart(file_url)
+    self.WaitForAllDownloadsToComplete()
     self.PerformActionOnDownload(self._GetDownloadId(), 'remove')
 
     # The download is removed from downloads, but not from the disk.
     self.assertFalse(self.GetDownloadsInfo().Downloads())
     self.assertTrue(os.path.exists(downloaded_pkg))
     self._DeleteAfterShutdown(downloaded_pkg)
 
   def testBigZip(self):
     """Verify that we can download a 1GB file.
 
@@ skipping 186 matching lines @@
     self.assertFalse(os.path.exists(downloaded_pkg))
 
   def testDownloadsPersistence(self):
     """Verify that download history persists on session restart."""
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
     file_url = self.GetFileURLForPath(os.path.join(test_dir, 'a_zip_file.zip'))
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   'a_zip_file.zip')
     self._ClearLocalDownloadState(downloaded_pkg)
     self.DownloadAndWaitForStart(file_url)
-    self.WaitForDownloadToComplete(downloaded_pkg)
+    self.WaitForAllDownloadsToComplete()
     downloads = self.GetDownloadsInfo().Downloads()
     self.assertEqual(1, len(downloads))
     self.assertEqual('a_zip_file.zip', downloads[0]['file_name'])
     file_url = downloads[0]['url']
     self.RestartBrowser(clear_profile=False)
     # Trigger the download service to get loaded after restart.
     self.NavigateToURL('chrome://downloads/')
     # Verify that there's no download shelf anymore.
     self.assertFalse(self.IsDownloadShelfVisible(),
                      'Download shelf persisted browser restart.')
@@ skipping 72 matching lines @@
     file_path = os.path.join(test_dir, 'a_zip_file.zip')
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg_regul = os.path.join(self.GetDownloadDirectory().value(),
                                         'a_zip_file.zip')
     downloaded_pkg_incog = os.path.join(self.GetDownloadDirectory().value(),
                                         'a_zip_file (1).zip')
     self._ClearLocalDownloadState(downloaded_pkg_regul)
     self._ClearLocalDownloadState(downloaded_pkg_incog)
 
     self.DownloadAndWaitForStart(file_url, 0)
-    self.WaitForAllDownloadsToComplete(0)
+    self.WaitForAllDownloadsToComplete(windex=0)
 
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.DownloadAndWaitForStart(file_url, 1)
-    self.WaitForAllDownloadsToComplete(1)
+    self.WaitForAllDownloadsToComplete(windex=1)
 
     # Verify download in regular window.
     self.assertTrue(os.path.exists(downloaded_pkg_regul))
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg_regul))
 
     # Verify download in incognito window.
     # bug 69738 WaitForAllDownloadsToComplete is flaky for this test case.
     # Using extra WaitUntil until this is resolved.
     self.assertTrue(self.WaitUntil(
         lambda: os.path.exists(downloaded_pkg_incog)))
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg_incog))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()