Modifying a download test to wait until download is completed.

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 376 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)
     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 162 matching lines @@
     # 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()