summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorsunandt@google.com <sunandt@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 22:35:36 +0000
committersunandt@google.com <sunandt@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 22:35:36 +0000
commit1948d3c1a4c1a506f8f4f0f24ae975ebcf590857 (patch)
treea704dbfb4e52e8918c5fe890b8933c2c95c46356 /chrome/test
parentf2976749b7dd62ffbce0bf20476e059db911d09d (diff)
downloadchromium_src-1948d3c1a4c1a506f8f4f0f24ae975ebcf590857.zip
chromium_src-1948d3c1a4c1a506f8f4f0f24ae975ebcf590857.tar.gz
chromium_src-1948d3c1a4c1a506f8f4f0f24ae975ebcf590857.tar.bz2
Changing a couple of pyauto browser tests to use a page that uses window.open to launch a popup
BUG=70659 TEST=Tests should not fail on Pyauto bots Review URL: http://codereview.chromium.org/6731008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/popup_blocker/popup-window-open.html1
-rw-r--r--chrome/test/functional/browser.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/test/data/popup_blocker/popup-window-open.html b/chrome/test/data/popup_blocker/popup-window-open.html
index 36cabf42..a4f58b36c9 100644
--- a/chrome/test/data/popup_blocker/popup-window-open.html
+++ b/chrome/test/data/popup_blocker/popup-window-open.html
@@ -10,5 +10,6 @@ function test() {
</script>
</head>
<body onload="test()">
+pop-up test page
</body>
</html> \ No newline at end of file
diff --git a/chrome/test/functional/browser.py b/chrome/test/functional/browser.py
index a7f7f18..f7c64df 100644
--- a/chrome/test/functional/browser.py
+++ b/chrome/test/functional/browser.py
@@ -177,7 +177,7 @@ class BrowserTest(pyauto.PyUITest):
def testPopupSharesProcess(self):
"""Verify that parent tab and popup share a process."""
file_url = self.GetFileURLForPath(os.path.join(
- self.DataDir(), 'popup_blocker', 'popup-blocked-to-post-blank.html'))
+ self.DataDir(), 'popup_blocker', 'popup-window-open.html'))
self.NavigateToURL(file_url)
blocked_popups = self.GetBlockedPopupsInfo()
self.assertEqual(1, len(blocked_popups), msg='Popup not blocked')
@@ -194,7 +194,7 @@ class BrowserTest(pyauto.PyUITest):
its popup process. Reloading both should share a process again.
"""
file_url = self.GetFileURLForPath(os.path.join(
- self.DataDir(), 'popup_blocker', 'popup-blocked-to-post-blank.html'))
+ self.DataDir(), 'popup_blocker', 'popup-window-open.html'))
self.NavigateToURL(file_url)
blocked_popups = self.GetBlockedPopupsInfo()
self.assertEqual(1, len(blocked_popups), msg='Popup not blocked')