Remove a url check from testSpecialURLTabs

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 23 matching lines @@
    'about:sync': 'chrome://sync-internals',
    'about:sync-internals': 'chrome://sync-internals',
    'about:version': 'chrome://version',
   }
 
   special_url_tabs = {
     'chrome://about': { 'title': 'Chrome URLs' },
     'chrome://appcache-internals': { 'title': 'AppCache Internals' },
     'chrome://blob-internals': { 'title': 'Blob Storage Internals' },
     'chrome://feedback': {},
-    'chrome://feedback/#0': { 'title': 'Feedback' },
     'chrome://chrome-urls': { 'title': 'Chrome URLs' },
     'chrome://crashes': { 'title': 'Crashes' },
     'chrome://credits': { 'title': 'Credits' },
     'chrome://downloads': { 'title': 'Downloads' },
     'chrome://dns': { 'title': 'About DNS' },
     'chrome://extensions': { 'title': 'Extensions' },
     'chrome://flags': {},
     'chrome://flash': {},
     'chrome://gpu-internals': {},
     'chrome://histograms': { 'title': 'About Histograms' },
@@ skipping 211 matching lines @@
        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.assertTrue(self.WaitUntil(
-            lambda: self.GetActiveTabTitle(), expect_retval=expected_title))
+          lambda: self.GetActiveTabTitle(), expect_retval=expected_title),
+          msg='Title did not match for %s. Expected: %s. Got %s' % (
+              url, expect_retval, self.GetActiveTabTitle()))
       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');
+        self.assertEqual(result, 'blocked',
+                         msg='Got %s for %s' % (result, url))
 
       # 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()