Fixing search_engines.SearchEnginesTest.testDiscoverSearchEngine

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
 import sys
 import tempfile
 import urllib
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 import pyauto_utils
+import test_utils
 
 
 class DownloadsTest(pyauto.PyUITest):
   """TestCase for Downloads."""
 
   def setUp(self):
     pyauto.PyUITest.setUp(self)
     # Record all entries in the download dir
     download_dir = self.GetDownloadDirectory().value()
     self._existing_downloads = []
@@ skipping 58 matching lines @@
     """Make a file on-the-fly with the given size. Returns the path to the
        file.
     """
     fd, file_path = tempfile.mkstemp(suffix='.zip', prefix='file-downloads-')
     os.lseek(fd, size, 0)
     os.write(fd, 'a')
     os.close(fd)
     logging.debug('Created temporary file %s of size %d' % (file_path, size))
     return file_path
 
-  def _CallFunctionWithNewTimeout(self, new_timeout, function):
-    """Sets the timeout to |new_timeout| and calls |function|.
-
-    This method resets the timeout before returning.
-    """
-    timeout_changer = pyauto.PyUITest.CmdExecutionTimeoutChanger(
-        self, new_timeout)
-    logging.info('Automation execution timeout has been changed to %d. '
-                 'If the timeout is large the test might appear to hang.'
-                 % new_timeout)
-    function()
-    del timeout_changer
-
   def _GetAllDownloadIDs(self):
     """Return a list of all download ids."""
     return [download['id'] for download in self.GetDownloadsInfo().Downloads()]
 
   def testNoDownloadWaitingNeeded(self):
     """Make sure "wait for downloads" returns quickly if we have none."""
     self.WaitForAllDownloadsToComplete()
 
   def testZip(self):
     """Download a zip and verify that it downloaded correctly.
@@ skipping 95 matching lines @@
     file_path = self._MakeFile(2**30)
     self._DeleteAfterShutdown(file_path)
     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._DeleteAfterShutdown(downloaded_pkg)
     # Waiting for big file to download might exceed automation timeout.
     # Temporarily increase the automation timeout.
-    self._CallFunctionWithNewTimeout(4 * 60 * 1000,  # 4 min.
-                                     self.WaitForAllDownloadsToComplete)
+    test_utils.CallFunctionWithNewTimeout(self, 4 * 60 * 1000,  # 4 min.
+                                          self.WaitForAllDownloadsToComplete)
     # Verify that the file was correctly downloaded
     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)
 
   def testFileRenaming(self):
     """Test file renaming when downloading a already-existing filename."""
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
@@ skipping 138 matching lines @@
     self.assertTrue(pause_dict['is_paused'])
     self.assertTrue(pause_dict['state'] == 'IN_PROGRESS')
 
     # Resume the download and assert it is not paused.
     resume_dict = self.PerformActionOnDownload(self._GetDownloadId(),
                                                'toggle_pause')
     self.assertFalse(resume_dict['is_paused'])
 
     # Waiting for big file to download might exceed automation timeout.
     # Temporarily increase the automation timeout.
-    self._CallFunctionWithNewTimeout(2 * 60 * 1000,  # 2 min.
-                                     self.WaitForAllDownloadsToComplete)
+    test_utils.CallFunctionWithNewTimeout(self, 2 * 60 * 1000,  # 2 min.
+                                          self.WaitForAllDownloadsToComplete)
 
     # Verify that the file was correctly downloaded after pause and resume.
     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)
 
   def testCancelDownload(self):
     """Verify that we can cancel a download."""
@@ skipping 75 matching lines @@
       return
     file_path = os.path.join(self.DataDir(), 'downloads', 'a_zip_file.zip')
     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)
     self.WaitForAllDownloadsToComplete()
     id = self._GetDownloadId()
     self.PerformActionOnDownload(id, 'toggle_open_files_like_this')
-    os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     # Retesting the flag we set
     file_url2 = self.GetFileURLForDataPath(os.path.join('zip', 'test.zip'))
     unzip_path = os.path.join(self.GetDownloadDirectory().value(),
                               'test', 'foo')
-    os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     os.path.exists(unzip_path) and pyauto_utils.RemovePath(unzip_path)
     self.DownloadAndWaitForStart(file_url2)
     self.WaitForAllDownloadsToComplete()
     # When the downloaded zip gets 'opened', a_file.txt will become available.
     self.assertTrue(self.WaitUntil(lambda: os.path.exists(unzip_path)),
                     'Did not open the filetype')
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
     os.path.exists(unzip_path) and pyauto_utils.RemovePath(unzip_path)
 
   def testExtendedAttributesOnMac(self):
@@ skipping 98 matching lines @@
 
     # Verify download in Incognito Window.
     # WaitForAllDownloadsToComplete does not wait for incognito downloads
     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()