[test] fix open-remote

rogerwang · rogerwang · commit cfe998edd254 · 2016-11-24T09:54:40.000+08:00
diff --git a/test/sanity/open-remote/remote.html b/test/sanity/open-remote/remote.html
@@ -1,4 +1,5 @@
 <script>
+window.name = 'remote';
 document.write('<h1 id="res">Node is ' + (typeof nw === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');
 document.write('<h1 id="res2">chrome.app.window is ' + (typeof chrome.app.window === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');
 document.write('<h1 id="res3">chrome.runtime is ' + (typeof chrome.runtime === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');
diff --git a/test/sanity/open-remote/test.py b/test/sanity/open-remote/test.py
@@ -23,6 +23,7 @@
 html = open('index.html', 'w')
 html.write('''
 <script>
+window.name = 'local';
 nw.Window.open('http://localhost:%s/remote.html', function(win) {
   document.write('<h1 id="res">returned window is ' + typeof win + '</h1>');
   win.y = 0;
@@ -35,16 +36,14 @@
 driver = webdriver.Chrome(executable_path=os.environ['CHROMEDRIVER'], chrome_options=chrome_options, desired_capabilities = capabilities)
 time.sleep(1)
 try:
-    wait_window_handles(driver, 2)
-    driver.switch_to_window(driver.window_handles[0])
+    wait_switch_window_name(driver, 'local')
     print driver.current_url
-    time.sleep(1)
-    result = driver.find_element_by_id('res').get_attribute('innerHTML')
-    print result
+    result = wait_for_element_id(driver, 'res')
+    print 'result=' + result
     assert("object" in result)
-    driver.switch_to_window(driver.window_handles[-1])
+    wait_switch_window_name(driver, 'remote')
     for id in ['res', 'res2', 'res3']:
-        result = driver.find_element_by_id(id).get_attribute('innerHTML')
+        result = wait_for_element_id(driver, id)
         print result
         assert("DISABLED" in result)
 finally:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<script>`
	`2`	`+window.name = 'remote';`
`2`	`3`	`document.write('<h1 id="res">Node is ' + (typeof nw === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');`
`3`	`4`	`document.write('<h1 id="res2">chrome.app.window is ' + (typeof chrome.app.window === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');`
`4`	`5`	`document.write('<h1 id="res3">chrome.runtime is ' + (typeof chrome.runtime === 'undefined' ? 'DISABLED': 'ENABLED') + '</h1>');`