Small test and ChromeDriver fixes to enable additional tests.

chrome/test/webdriver/run_webdriver_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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 optparse
 import os
 import sys
@@ skipping 225 matching lines @@
       if name.startswith('-'):  # Exclude
         excluded.extend(self._GetTestsFromName(self.TEST_PREFIX + name[1:]))
       else:
         args.extend(self._GetTestsFromName(self.TEST_PREFIX + name))
     for name in excluded:
       args.remove(name)
     if excluded:
       logging.debug('Excluded %d test(s): %s' % (len(excluded), excluded))
     return args
 
+  def _FakePytestHack(self):
+    """Adds a fake 'pytest' module to the system modules.
+
+    This is a hack for getting the text_handling_tests to run. It is the only
+    file that uses the pytest module, which we're not sure we want to pull
+    into chromium yet.
+    """
+    import imp
+    sys.modules['pytest'] = imp.new_module('pytest')
+
   def _Run(self):
     """Run the tests."""
+    # TODO(kkania): Remove this hack.
+    self._FakePytestHack()
+
     test_names = self._GetTestNames(self._args)
 
     # The tests expect to run with preset 'driver' and 'webserver' class
     # properties.
     launcher = ChromeDriverLauncher(self._options.driver_exe,
                                     chromedriver_paths.WEBDRIVER_TEST_DATA)
     driver = WebDriver(launcher.GetURL(), {})
     # The tests expect a webserver. Since ChromeDriver also operates as one,
     # just pass this dummy class with the right info.
     class DummyWebserver:
@@ skipping 12 matching lines @@
     verbosity = 1
     if self._options.verbose:
       verbosity = 2
     result = GTestTextTestRunner(verbosity=verbosity).run(test_suite)
     launcher.Kill()
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()