[test] fix race condition in issue5087-webview-cleardata

rogerwang · rogerwang · commit ae05cb6133a9 · 2016-11-24T09:54:40.000+08:00
diff --git a/test/sanity/issue5087-webview-cleardata/index.tpl b/test/sanity/issue5087-webview-cleardata/index.tpl
@@ -10,6 +10,7 @@
   <button id="clear">clear data</button>
   <p id="result"></p>
   <script type="text/javascript">
+  window.name = 'index';
   window.onload = () => {
     var webview = document.getElementById('webview')
     var clear = document.getElementById('clear')
diff --git a/test/sanity/issue5087-webview-cleardata/test.py b/test/sanity/issue5087-webview-cleardata/test.py
@@ -33,15 +33,14 @@
 time.sleep(1)
 try:
     wait_window_handles(driver, 2)
+    wait_switch_window_name(driver, 'index')
     print driver.current_url
     driver.find_element_by_id('clear').click()
-    result = driver.find_element_by_id('result').get_attribute('innerHTML')
+    result = wait_for_element_id_content(driver, 'result', 'success')
     print result
-    assert('success' in result)
     driver.find_element_by_id('clear').click()
-    result = driver.find_element_by_id('result').get_attribute('innerHTML')
+    result = wait_for_element_id_content(driver, 'result', 'success')
     print result
-    assert('success' in result)
 finally:
     driver.quit()
     server.terminate()
diff --git a/test/sanity/nw_util.py b/test/sanity/nw_util.py
@@ -18,6 +18,21 @@ def wait_for_element_id(driver, elem_id, timeout=10):
              raise Exception('Timeout when waiting for element' + elem_id)
     return ret
 
+def wait_for_element_id_content(driver, elem_id, content, timeout=10):
+    ret = ''
+    while timeout > 0:
+        try:
+            ret = driver.find_element_by_id(elem_id).get_attribute('innerHTML')
+            if content in ret:
+              break
+        except selenium.common.exceptions.NoSuchElementException:
+            pass
+        time.sleep(1)
+        timeout = timeout - 1
+        if timeout <= 0:
+             raise Exception('Timeout when waiting for element: ' + elem_id + " content: " + content)
+    return ret
+
 # wait for window handles
 def wait_window_handles(driver, until, timeout=60):
     if not hasattr(until, '__call__'):
