Merge pull request vitessio#2759 from thompsonja/vtctld

Reduce vtctld webdriver test flakiness.

Author: thompsonja

test/vtctld_web_test.py

@@ -44,6 +44,8 @@ def tearDownModule():
 
 class TestVtctldWeb(unittest.TestCase):
 
+  WEBDRIVER_TIMEOUT_S = 10
+
   @classmethod
   def setUpClass(cls):
     """Set up two keyspaces: one unsharded, one with two shards."""
@@ -94,7 +96,11 @@ def _get_keyspaces(self):
 
   def _get_keyspace_element(self, keyspace_name):
     """Get a specific keyspace element given a keyspace name."""
-    return self.driver.find_element_by_id('%s-card' % keyspace_name)
+    element_id = '%s-card' % keyspace_name
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
+    wait.until(expected_conditions.visibility_of_element_located(
+        (By.ID, element_id)))
+    return self.driver.find_element_by_id(element_id)
 
   def _get_shards(self, keyspace_name):
     shard_grid = self.driver.find_element_by_id(
@@ -126,6 +132,9 @@ def _get_tablet_names(self):
         [(x.split(' ')[0], x.split(' ')[1][1:-1]) for x in tablet_titles])
 
   def _get_shard_record_keyspace_shard(self):
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
+    wait.until(expected_conditions.visibility_of_element_located(
+        (By.ID, 'keyspace-shard')))
     return self.driver.find_element_by_id('keyspace-shard').text
 
   def _get_shard_record_master_tablet(self):
@@ -241,7 +250,7 @@ def _check_new_view(
   def _navigate_to_dashboard(self):
     logging.info('Fetching main vtctld page: %s', self.vtctld_addr)
     self.driver.get('%s/app2' % self.vtctld_addr)
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.ID, 'test_keyspace')))
 
@@ -254,7 +263,7 @@ def _navigate_to_keyspace_view(self):
     first_keyspace_card = keyspace_cards[0]
     shard_stats = first_keyspace_card.find_element_by_tag_name('md-list')
     shard_stats.click()
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.CLASS_NAME, 'vt-card')))
 
@@ -267,14 +276,14 @@ def _navigate_to_shard_view(self):
 
     first_shard_card = shard_cards[0]
     first_shard_card.click()
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.ID, '1')))
 
   # Get Elements
   def _get_dashboard_keyspaces(self):
     """Get list of all present keyspaces."""
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.TAG_NAME, 'vt-dashboard')))
     dashboard_content = self.driver.find_element_by_tag_name('vt-dashboard')
@@ -283,23 +292,23 @@ def _get_dashboard_keyspaces(self):
 
   def _get_dashboard_shards(self):
     """Get list of all present shards."""
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.TAG_NAME, 'vt-dashboard')))
     dashboard_content = self.driver.find_element_by_tag_name('vt-dashboard')
     return [sh.text for sh in
             dashboard_content.find_elements_by_class_name('vt-shard-stats')]
 
   def _get_keyspace_shards(self):
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.TAG_NAME, 'vt-keyspace-view')))
     keyspace_content = self.driver.find_element_by_tag_name('vt-keyspace-view')
     return [sh.text for sh in
             keyspace_content.find_elements_by_class_name('vt-serving-shard')]
 
   def _get_shard_tablets(self):
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.TAG_NAME, 'vt-shard-view')))
     shard_content = self.driver.find_element_by_tag_name('vt-shard-view')
@@ -536,7 +545,7 @@ def test_realtime_stats(self):
     self.driver.get('%s/app2' % self.vtctld_addr)
     status_button = self.driver.find_element_by_partial_link_text('Status')
     status_button.click()
-    wait = WebDriverWait(self.driver, 10)
+    wait = WebDriverWait(self.driver, self.WEBDRIVER_TIMEOUT_S)
     wait.until(expected_conditions.visibility_of_element_located(
         (By.TAG_NAME, 'vt-status')))