[test] fix race condition in zoom-all test

rogerwang · rogerwang · commit 61eed7d2b1cd · 2016-12-21T12:19:12.000+08:00
diff --git a/test/sanity/issue4352-zoom-all/index.html b/test/sanity/issue4352-zoom-all/index.html
@@ -5,6 +5,7 @@
   <body>
     <div id='result'>zoom level</div>
     <script>
+      window.name = 'index';
       function test(val) {
       document.getElementById('result').innerHTML = val;
       }
diff --git a/test/sanity/issue4352-zoom-all/popup.html b/test/sanity/issue4352-zoom-all/popup.html
@@ -5,6 +5,7 @@
   <body>
     <div id='result'>zoom level</div>
     <script>
+      window.name = 'popup';
       nw.Window.get().zoomLevel = 2;
       setTimeout(function() {
         document.getElementById('result').innerHTML = window.devicePixelRatio;
diff --git a/test/sanity/issue4352-zoom-all/test.py b/test/sanity/issue4352-zoom-all/test.py
@@ -1,5 +1,8 @@
 import time
 import os
+import sys
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from nw_util import *
 
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
@@ -10,14 +13,15 @@
 driver.implicitly_wait(5)
 time.sleep(1)
 try:
+    wait_window_handles(driver, 2)
+    wait_switch_window_name(driver, 'popup')
     print driver.current_url
-    driver.switch_to_window(driver.window_handles[-1])
     zoom2 = 'zoom level'
     while zoom2 == 'zoom level':
         zoom2 = driver.find_element_by_id('result').get_attribute('innerHTML')
         time.sleep(1)
     print "zoom2: ", zoom2
-    driver.switch_to_window(driver.window_handles[0])
+    wait_switch_window_name(driver, 'index')
     driver.find_element_by_id('get-zoom').click()
     zoom1 = driver.find_element_by_id('result').get_attribute('innerHTML')
     print "zoom1: ", zoom1

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`<body>`
`6`	`6`	`<div id='result'>zoom level</div>`
`7`	`7`	`<script>`
	`8`	`+ window.name = 'index';`
`8`	`9`	`function test(val) {`
`9`	`10`	`document.getElementById('result').innerHTML = val;`
`10`	`11`	`}`