Account for some UI changes in the Chrome Endure docs/plus tests.

chrome/test/functional/perf_endure.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Performance tests for Chrome Endure (long-running perf tests on Chrome).
 
 This module accepts the following environment variable inputs:
   TEST_LENGTH: The number of seconds in which to run each test.
   PERF_STATS_INTERVAL: The number of seconds to wait in-between each sampling
@@ skipping 949 matching lines @@
 
   def testDocsAlternatelyClickLists(self):
     """Alternates between two different document lists.
 
     This test alternately clicks the "Shared with me" and "My Drive" buttons in
     Google Docs, and periodically gathers performance stats that may reveal
     memory bloat.
     """
     test_description = 'AlternateLists'
 
+    def sort_menu_setup():
+      # Open and close the "Sort" menu to get some DOM nodes to appear that are
+      # used by the scenario in this test.
+      sort_xpath = '//div[text()="Sort"]'
+      self.WaitForDomNode(sort_xpath)
+      sort_button = self._GetElement(self._driver.find_element_by_xpath,
+                                     sort_xpath)
+      sort_button.click()
+      sort_button.click()

[Nirnimesh, 2012/08/02 23:11:34]

twice?

[dennis_jeffrey, 2012/08/02 23:26:55]

yes, once to open the sort menu and once to close it.  it seems kinda hacky, but
doing this causes two divs to be added to the DOM that are used in lines 989 and
1000 below.

+
     def scenario():
       # Click the "Shared with me" button, wait for 1 second, click the
       # "My Drive" button, wait for 1 second.
 
       # Click the "Shared with me" button and wait for a div to appear.
       if not self._ClickElementByXpath(
           self._driver, '//span[starts-with(text(), "Shared with me")]'):
         self._num_errors += 1
-      self.WaitForDomNode('//div[text()="Share date"]')
+      try:
+        self.WaitForDomNode('//div[text()="Share date"]')
+      except pyauto_errors.JSONInterfaceError:
+        # This case can occur when the page reloads; set things up again.
+        sort_menu_setup()
       time.sleep(1)
 
       # Click the "My Drive" button and wait for a resulting div to appear.
       if not self._ClickElementByXpath(
           self._driver, '//span[starts-with(text(), "My Drive")]'):
         self._num_errors += 1
-      self.WaitForDomNode('//div[text()="Quota used"]')
+      try:
+        self.WaitForDomNode('//div[text()="Quota used"]')
+      except pyauto_errors.JSONInterfaceError:
+        # This case can occur when the page reloads; set things up again.
+        sort_menu_setup()
       time.sleep(1)
 
-    # Open and close the "Sort" menu to get some DOM nodes to appear that are
-    # used by the scenario in this test.
-    sort_xpath = '//div[text()="Sort"]'
-    self.WaitForDomNode(sort_xpath)
-    sort_button = self._GetElement(self._driver.find_element_by_xpath,
-                                   sort_xpath)
-    sort_button.click()
-    sort_button.click()
+    sort_menu_setup()
 
     self._RunEndureTest(self._WEBAPP_NAME, self._TAB_TITLE_SUBSTRING,
                         test_description, scenario)
 
 
 class ChromeEndurePlusTest(ChromeEndureBaseTest):
   """Long-running performance tests for Chrome using Google Plus."""
 
   _WEBAPP_NAME = 'Plus'
   _TAB_TITLE_SUBSTRING = 'Google+'
@@ skipping 29 matching lines @@
       # button, wait for 1 second.
 
       # Click the "Friends" button and wait for a resulting div to appear.
       if not self._ClickElementByXpath(
           self._driver,
           '//div[text()="Friends" and '
           'starts-with(@data-dest, "stream/circles")]'):
         self._num_errors += 1
 
       try:
-        self.WaitForDomNode('//div[text()="Friends"]')
+        self.WaitForDomNode('//span[contains(., "in Friends")]')
       except (pyauto_errors.JSONInterfaceError,
               pyauto_errors.JavascriptRuntimeError):
         self._num_errors += 1
 
       time.sleep(1)
 
       # Click the "Family" button and wait for a resulting div to appear.
       if not self._ClickElementByXpath(
           self._driver,
           '//div[text()="Family" and '
           'starts-with(@data-dest, "stream/circles")]'):
         self._num_errors += 1
 
       try:
-        self.WaitForDomNode('//div[text()="Family"]')
+        self.WaitForDomNode('//span[contains(., "in Family")]')
       except (pyauto_errors.JSONInterfaceError,
               pyauto_errors.JavascriptRuntimeError):
         self._num_errors += 1
 
       time.sleep(1)
 
     self._RunEndureTest(self._WEBAPP_NAME, self._TAB_TITLE_SUBSTRING,
                         test_description, scenario)
 
 
@@ skipping 48 matching lines @@
         self._num_errors += 1
 
       time.sleep(1)
 
     self._RunEndureTest(self._WEBAPP_NAME, self._TAB_TITLE_SUBSTRING,
                         test_description, scenario)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()