Modifying some downloads hooks to act per-window (so that incognito windows c...

chrome/test/functional/downloads.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 127 matching lines @@
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg))
 
   def testZipInIncognito(self):
     """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)
 
-    self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)  # open incognito window
-    # Downloads from incognito window do not figure in GetDownloadsInfo()
-    # since the download manager's list doesn't contain it.
-    # Using WaitUntil is the only resort.
-    self.NavigateToURL(file_url, 1, 0)
-    self.assertTrue(self.WaitUntil(lambda: os.path.exists(downloaded_pkg)))
+    # Trigger download and wait in new incognito window.
+    self.DownloadAndWaitForStart(file_url, 1)
+    self.WaitForAllDownloadsToComplete(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))
     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))
@@ skipping 360 matching lines @@
     file_path = self._MakeFile(2**24)
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     self.DownloadAndWaitForStart(file_url)
     id = self._GetDownloadId()
     self.PerformActionOnDownload(id, 'open')
     self.WaitForAllDownloadsToComplete()
     unzip_file_name = downloaded_pkg + '.cpgz'
-    # Verify that the file was correctly downloaded
+    # Verify that the file was correctly downloaded.
     self.assertTrue(self.WaitUntil(lambda: os.path.exists(unzip_file_name)),
                     'Unzipped folder %s missing.' % unzip_file_name)
     self.assertTrue(os.path.exists(downloaded_pkg),
                     'Downloaded file %s missing.' % downloaded_pkg)
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg),
                     'Downloaded file %s does not match original' %
                       downloaded_pkg)
     os.path.exists(file_path) and os.remove(file_path)
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     os.path.exists(unzip_file_name) and os.remove(unzip_file_name)
 
   def testDownloadPercentage(self):
     """Verify that during downloading, % values increases,
        and once download is over, % value is 100"""
     file_path = self._MakeFile(2**24)
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     self.DownloadAndWaitForStart(file_url)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     downloads = self.GetDownloadsInfo().Downloads()
     old_percentage = downloads[0]['PercentComplete']
     def _PercentInc():
       percent = self.GetDownloadsInfo().Downloads()[0]['PercentComplete']
       return old_percentage == 100 or percent > old_percentage,
     self.assertTrue(self.WaitUntil(_PercentInc),
         msg='Download percentage value is not increasing')
-    # Once download is completed, percentage is 100
+    # Once download is completed, percentage is 100.
     self.WaitForAllDownloadsToComplete()
     downloads = self.GetDownloadsInfo().Downloads()
     self.assertEqual(downloads[0]['PercentComplete'], 100,
         'Download percentage should be 100 after download completed')
     os.path.exists(file_path) and os.remove(file_path)
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
 
   def testDownloadIncognitoAndRegular(self):
     """Download the same zip file in regular and incognito window and
        verify that it downloaded correctly with same file name appended with
        counter for the second download in regular 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_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.NavigateToURL(file_url, 0, 0)
+
+    self.DownloadAndWaitForStart(file_url, 0)
+    self.WaitForAllDownloadsToComplete(0)
+
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
-    self.NavigateToURL(file_url, 1, 0)
-    self.WaitForAllDownloadsToComplete()
+    self.DownloadAndWaitForStart(file_url, 1)
+    self.WaitForAllDownloadsToComplete(1)
 
-    # Verify download in regular Window.
+    # 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.
-    # WaitForAllDownloadsToComplete does not wait for incognito downloads
+    # Verify download in incognito window.
+    # WaitForAllDownloadsToComplete is flaky for this test case.

[Nirnimesh, 2011/01/15 02:28:04]

Please create a bug and cc rdsmith on it. Reference the bug here

And in the interest of keeping the flakiness low, continue using the old method,
or at least use that too.

     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()