diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:07:46 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:07:46 +0000 |
| commit | 5b3218d8ea9351c119474a4ef8eefeb8f488b2d3 (patch) | |
| tree | 5bd095a023c342e923c8b133c168346c418ff810 /chrome/test | |
| parent | 0089f26797c9df181a5dd9e4a0321888853b807e (diff) | |
| download | chromium_src-5b3218d8ea9351c119474a4ef8eefeb8f488b2d3.zip chromium_src-5b3218d8ea9351c119474a4ef8eefeb8f488b2d3.tar.gz chromium_src-5b3218d8ea9351c119474a4ef8eefeb8f488b2d3.tar.bz2 | |
Revert "Work around download system breakpage by using WaitUntil on pyauto side."
BUG=
TEST=
Review URL: http://codereview.chromium.org/3341008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/functional/downloads.py | 8 | ||||
| -rw-r--r-- | chrome/test/pyautolib/pyauto.py | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/chrome/test/functional/downloads.py b/chrome/test/functional/downloads.py index 1af21c8..5ec5484 100644 --- a/chrome/test/functional/downloads.py +++ b/chrome/test/functional/downloads.py @@ -200,12 +200,8 @@ class DownloadsTest(pyauto.PyUITest): self.DownloadAndWaitForStart(file_url) # Waiting for big file to download might exceed automation timeout. # Temporarily increase the automation timeout. - - # Temp workaround for crbug.com/54131 - # self._CallFunctionWithNewTimeout(4 * 60 * 1000, # 4 min. - # self.WaitForAllDownloadsToComplete) - self.WaitForAllDownloadsToComplete(timeout=4*60*1000) - # -- End workaround + self._CallFunctionWithNewTimeout(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) diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index 2a48f55..3677851 100644 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -489,22 +489,13 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): } self._GetResultFromJSONRequest(cmd_dict) - def WaitForAllDownloadsToComplete(self, timeout=-1): + def WaitForAllDownloadsToComplete(self): """Wait for all downloads to complete. - Args: - timeout: The timeout to use - default is WaitUntil's default timeout. - Note: This method does not work for dangerous downloads. Use WaitForGivenDownloadsToComplete (below) instead. """ - # Downloads implementation is largely broken. Try to get around by using - # WaitUntil instead of using notifications. crbug.com/54131 - # self._GetResultFromJSONRequest( - # {'command': 'WaitForAllDownloadsToComplete'}) - return self.WaitUntil( - lambda: len(self.GetDownloadsInfo().DownloadsInProgress()) == 0, - timeout=timeout) + self._GetResultFromJSONRequest({'command': 'WaitForAllDownloadsToComplete'}) def WaitForDownloadToComplete(self, download_path, timeout=-1): """Wait for the given downloads to complete. |