Fix pyauto downloads tests to trigger dangerous downloads to match expectation

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 filecmp
 import logging
 import os
 import shutil
 import sys
@@ skipping 43 matching lines @@
     """Prepare for downloading the given path.
 
     Clears the given path and the corresponding .crdownload, to prepare it to
     be downloaded.
     """
     os.path.exists(path) and os.remove(path)
     crdownload = path + '.crdownload'
     os.path.exists(crdownload) and os.remove(crdownload)
 
   def _GetDangerousDownload(self):
-    """Returns the file url for a dangerous download for this OS."""
+    """Returns the file path for a dangerous download for this OS."""
     sub_path = os.path.join(self.DataDir(), 'downloads', 'dangerous')
     if self.IsMac():
       return os.path.join(sub_path, 'invalid-dummy.dmg')
     return os.path.join(sub_path, 'dangerous.exe')
 
   def _EqualFileContents(self, file1, file2):
     """Determine if 2 given files have the same contents."""
     if not (os.path.exists(file1) and os.path.exists(file2)):
       return False
     return filecmp.cmp(file1, file2, shallow=False)
@@ skipping 76 matching lines @@
     # 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)))
     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()
-    file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
-
-    self.DownloadAndWaitForStart(file_url)
+    self._TriggerUnsafeDownload(os.path.basename(file_path))
     self.PerformActionOnDownload(self._GetDownloadId(),
                                  'save_dangerous_download')
     self.WaitForDownloadToComplete(downloaded_pkg)
 
     # 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()
-    file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
-
-    self.DownloadAndWaitForStart(file_url)
+    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."""
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
     file_path = os.path.join(test_dir, 'a_zip_file.zip')
@@ skipping 105 matching lines @@
     self.assertEqual(len(downloads), len(crazy_filenames))
 
     for filename in crazy_filenames:
       downloaded_file = os.path.join(download_dir, filename)
       self.assertTrue(os.path.exists(downloaded_file))
       self.assertTrue(   # Verify file contents.
           self._EqualFileContents(downloaded_file,
                                   os.path.join(temp_dir, filename)))
       os.path.exists(downloaded_file) and os.remove(downloaded_file)
 
+  def _TriggerUnsafeDownload(self, filename, tab_index=0, windex=0):
+    """Trigger download of an unsafe/dangerous filetype.
+
+    Files explictly requested by the user (like navigating to a package, or
+    clicking on a link) aren't marked unsafe.
+    Only the ones where the user didn't directly initiate a download are
+    marked unsafe.
+
+    Waits until the download starts.

[kkania, 2010/12/14 00:50:43]

Maybe mention that this navigates the current page?

[Nirnimesh, 2010/12/14 01:05:21]

Done.

+
+    Args:
+      filename: the name of the file to trigger the download.
+                This should exist in the 'dangerous' directory.

[kkania, 2010/12/14 00:50:43]

how about change this to take an absolute path (which GetDangerousDownload
returns), or change GetDangerousDownload to get the relative path? That way you
don't have to do os.path.basename.

[Nirnimesh, 2010/12/14 01:05:21]

I want to ensure that the dangerous file exists in the same dir where the .html
lives. Or else I'd need to use relative paths wrt dangerous dir which'll get
more involved. I don't want to give the feeling that it's ok to pass any abs
path to this function.

+      tab_index: tab index. Default 0.
+      windex: window index. Default 0.
+    """
+    dangerous_dir = os.path.join(
+        self.DataDir(), 'downloads', 'dangerous')
+    assert os.path.isfile(os.path.join(dangerous_dir, filename))
+    file_url = self.GetFileURLForDataPath(os.path.join(
+        dangerous_dir, 'download-dangerous.html')) + '?' + filename
+    num_downloads = len(self.GetDownloadsInfo().Downloads())
+    self.NavigateToURL(file_url, windex, tab_index)

[kkania, 2010/12/14 00:50:43]

Instead of creating the new html page just for redirect, how about just execute
the javascript window.location = ... in the current page?

[Nirnimesh, 2010/12/14 01:05:21]

There's no current page yet.

+    # It might take a while for the download to kick in, hold on until then.
+    self.assertTrue(self.WaitUntil(
+        lambda: len(self.GetDownloadsInfo().Downloads()) == num_downloads + 1))
+
   def testNoUnsafeDownloadsOnRestart(self):
     """Verify that unsafe file should not show up on session restart."""
     file_path = self._GetDangerousDownload()
-    file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
-    self.DownloadAndWaitForStart(file_url)
+    self._TriggerUnsafeDownload(os.path.basename(file_path))
     self.assertTrue(self.IsDownloadShelfVisible())
     # Restart the browser and assert that the download was removed.
     self.RestartBrowser(clear_profile=False)
     self.assertFalse(os.path.exists(downloaded_pkg))
     self.assertFalse(self.IsDownloadShelfVisible())
     self.NavigateToURL("chrome://downloads")
     self.assertFalse(self.GetDownloadsInfo().Downloads())
 
   def testPauseAndResume(self):
     """Verify that pause and resume work while downloading a file.
@@ skipping 100 matching lines @@
     self.PerformActionOnDownload(self._GetDownloadId(),
                                  'save_dangerous_download')
     # Wait for the theme to be set automatically.
     self.assertTrue(self.WaitUntilDownloadedThemeSet('camo theme'))
     self.assertTrue(self.WaitUntil(lambda path: not os.path.exists(path),
                                    args=[downloaded_pkg]))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()