Fix pyauto test: testSpecialURLTab

chrome/test/functional/special_tabs.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.
 
 import logging
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 119 matching lines @@
 
     # crashes on chromeos=1 on linux, possibly missing real CrOS features.
     'chrome://cryptohome': { 'CSP': False},
     'chrome://mobilesetup': { 'CSP': False },
     'chrome://print': { 'CSP': False },
     'chrome://tasks': {},
   }
 
   linux_special_url_tabs = {
     'chrome://linux-proxy-config': { 'title': 'Proxy Configuration Help' },
-    'chrome://tcmalloc': { 'title': 'About tcmalloc' },
+    'chrome://tcmalloc': { 'title': 'tcmalloc stats' },
     'chrome://sandbox': { 'title': 'Sandbox Status' },
   }
   broken_linux_special_url_tabs = {}
 
   mac_special_url_tabs = {
     'chrome://settings/languages': { 'title': 'Settings - Languages' },
   }
   broken_mac_special_url_tabs = {}
 
   win_special_url_tabs = {
@@ skipping 114 matching lines @@
        Also ensures they specify content-security-policy and not inline
        scripts for those pages that are expected to do so.  Patches which
        break this test by including new inline javascript are security
        vulnerabilities and should be reverted."""
     tabs = self._GetPlatformSpecialURLTabs()
     for url, properties in tabs.iteritems():
       logging.debug('Testing URL %s.' % url)
       self.NavigateToURL(url)
       expected_title = 'title' in properties and properties['title'] or url
       actual_title = self.GetActiveTabTitle()
-      self.assertEqual(expected_title, actual_title)
+      self.assertTrue(self.WaitUntil(
+            lambda: self.GetActiveTabTitle(), expect_retval=expected_title))
       include_list = []
       exclude_list = []
       no_csp = 'CSP' in properties and not properties['CSP']
       if no_csp:
         exclude_list.extend(['X-WebKit-CSP'])
       else:
         exclude_list.extend(['<script>', 'onclick=', 'onload=',
                              'onchange=', 'onsubmit=', 'javascript:'])
       if 'includes' in properties:
         include_list.extend(properties['includes'])
       if 'excludes' in properties:
         exclude_list.extend(properties['exlcudes'])
       test_utils.StringContentCheck(self, self.GetTabContents(),
                                     include_list, exclude_list)
       result = self.ExecuteJavascript("""
           var r = 'blocked';
           var f = 'executed';
           var s = document.createElement('script');
           s.textContent = 'r = f';
           document.body.appendChild(s);
           window.domAutomationController.send(r);
         """)
       logging.debug('has csp %s, result %s.' % (not no_csp, result))
       if no_csp:
         self.assertEqual(result, 'executed',
                          msg='Got %s for %s' % (result, url))
       else:
         self.assertEqual(result, 'blocked');
 
+      # Restart browser so that every URL gets a fresh instance.
+      self.RestartBrowser(clear_profile=False)
+
   def testAboutAppCacheTab(self):
     """Test App Cache tab to confirm about page populates caches."""
     self.NavigateToURL('about:appcache-internals')
     self._VerifyAppCacheInternals()
     self.assertEqual('AppCache Internals', self.GetActiveTabTitle())
 
   def testAboutDNSTab(self):
     """Test DNS tab to confirm DNS about page propogates records."""
     self.NavigateToURL('about:dns')
     self._VerifyAboutDNS()
     self.assertEqual('About DNS', self.GetActiveTabTitle())
 
   def testSpecialAcceratorTabs(self):
     """Test special tabs created by accelerators."""
     for accel, title in self.GetSpecialAcceleratorTabs().iteritems():
       self.RunCommand(accel)
       self.assertTrue(self.WaitUntil(
             self.GetActiveTabTitle, expect_retval=title),
           msg='Expected "%s", got "%s"' % (title, self.GetActiveTabTitle()))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()