Commit bb724614 authored by sunandt@google.com's avatar sunandt@google.com

Modifying a download test to wait until download is completed.

BUG=83942
TEST=downloads.DownloadsTest.testDownloadsPersistence
Review URL: http://codereview.chromium.org/6992090

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86760 0039d316-1c4b-4281-b951-d872f2087c98
parent 772e38b0
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
'crash_reporter', 'crash_reporter',
'databases', 'databases',
'downloads', 'downloads',
'find_in_page', 'find_in_page',
# Turkish I problem. crbug.com/60638 # Turkish I problem. crbug.com/60638
'-find_in_page.FindMatchTests.testLocalizationAndCaseOrder', '-find_in_page.FindMatchTests.testLocalizationAndCaseOrder',
'execute_javascript', 'execute_javascript',
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
# crbug.com/50481, crbug.com/54942 # crbug.com/50481, crbug.com/54942
'-downloads.DownloadsTest.testZip', '-downloads.DownloadsTest.testZip',
'-downloads.DownloadsTest.testRemoveDownload', '-downloads.DownloadsTest.testRemoveDownload',
'-downloads.DownloadsTest.testDownloadsPersistence', # crbug.com/83942
# crbug.com/66072 # crbug.com/66072
'-notifications.NotificationsTest.testNotificationOrderAfterClosingOne', '-notifications.NotificationsTest.testNotificationOrderAfterClosingOne',
# crbug.com/70694, crbug.com/73078 # crbug.com/70694, crbug.com/73078
......
...@@ -394,6 +394,7 @@ class DownloadsTest(pyauto.PyUITest): ...@@ -394,6 +394,7 @@ class DownloadsTest(pyauto.PyUITest):
'a_zip_file.zip') 'a_zip_file.zip')
self._ClearLocalDownloadState(downloaded_pkg) self._ClearLocalDownloadState(downloaded_pkg)
self.DownloadAndWaitForStart(file_url) self.DownloadAndWaitForStart(file_url)
self.WaitForDownloadToComplete(downloaded_pkg)
downloads = self.GetDownloadsInfo().Downloads() downloads = self.GetDownloadsInfo().Downloads()
self.assertEqual(1, len(downloads)) self.assertEqual(1, len(downloads))
self.assertEqual('a_zip_file.zip', downloads[0]['file_name']) self.assertEqual('a_zip_file.zip', downloads[0]['file_name'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment