Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: chrome/test/functional/popups.py

Issue 6758045: Merge 79596 - Modifying the test, popups.PopupsTest.testLaunchBlockedPopupInIncognito, to wait un... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/696/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/popups.py
===================================================================
--- chrome/test/functional/popups.py (revision 80082)
+++ chrome/test/functional/popups.py (working copy)
@@ -65,7 +65,10 @@
file_url = self.GetFileURLForPath(os.path.join(
self.DataDir(), 'popup_blocker', 'popup-window-open.html'))
self.NavigateToURL(file_url, 1, 0)
- self.assertEqual(1, len(self.GetBlockedPopupsInfo(tab_index=0, windex=1)))
+ # Wait until the popup is blocked
+ self.assertTrue(self.WaitUntil(lambda:
+ len(self.GetBlockedPopupsInfo(tab_index=0, windex=1)) is 1),
+ msg='Popup not blocked')
self.UnblockAndLaunchBlockedPopup(0, tab_index=0, windex=1)
# Verify that no more popups are blocked
self.assertFalse(self.GetBlockedPopupsInfo(tab_index=0, windex=1))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698