Fix for flakiness in pyauto automation hook WaitForDownloadsToComplete.

chrome/test/functional/infobars.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 logging
 import os
 import re
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 111 matching lines @@
   def testMultipleDownloadsInfobar(self):
     """Verify the mutiple downloads infobar."""
     zip_file = 'a_zip_file.zip'
     html_file = 'download-a_zip_file.html'
     assert pyauto.PyUITest.IsEnUS()
     file_url = self.GetFileURLForDataPath('downloads', html_file)
     match_text = 'This site is attempting to download multiple files. ' \
                  'Do you want to allow this?'
     self.NavigateToURL('chrome://downloads')  # trigger download manager
     test_utils.RemoveDownloadedTestFile(self, zip_file)
+    pre_download_ids = [x['id'] for x in self.GetDownloadsInfo().Downloads()]
     self.DownloadAndWaitForStart(file_url)
     # trigger page reload, which triggers the download infobar
     self.GetBrowserWindow(0).GetTab(0).Reload()
     self.assertTrue(self.WaitForInfobarCount(1))
     tab_info = self._GetTabInfo(0, 0)
     infobars = tab_info['infobars']
     self.assertTrue(infobars, 'Expected the multiple downloads infobar')
     self.assertEqual(1, len(infobars))
     self.assertEqual(match_text, infobars[0]['text'])
     self.assertEqual(2, len(infobars[0]['buttons']))
     self.assertEqual('Allow', infobars[0]['buttons'][0])
     self.assertEqual('Deny', infobars[0]['buttons'][1])
-    self.WaitForAllDownloadsToComplete()
+    self.WaitForAllDownloadsToComplete(pre_download_ids)
     test_utils.RemoveDownloadedTestFile(self, zip_file)
 
   def testPluginCrashForMultiTabs(self):
     """Verify plugin crash infobar shows up only on the tabs using plugin."""
     non_flash_url = self.GetFileURLForDataPath('english_page.html')
     flash_url = self.GetFileURLForDataPath('plugin', 'FlashSpin.swf')
     # False = Non flash url, True = Flash url
     # We have set of these values to compare a flash page and a non-flash page
     urls_type = [False, True, False, True, False]
     for count in range(2):
@@ skipping 22 matching lines @@
         self.assertTrue(
             self.WaitForInfobarCount(1, windex=0, tab_index=i),
             msg='Expected crash infobar in tab at index %d' % i)
         infobar = self.GetBrowserInfo()['windows'][0]['tabs'][i]['infobars']
         self.assertEqual(infobar[0]['type'], 'confirm_infobar')
         self.assertEqual(len(infobar), 1)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()