Modified output format to be accepted by Pulse. Updated DEPS to include newer...

tests/selenium/main.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 366 matching lines @@
                                     self.sel_port,
                                     browser + browser_path_with_space,
                                     server_url)
     
     new_session.start()
     new_session.set_timeout(self.sel_timeout)
     
     return new_session
 
 
-def TestBrowser(session_builder, browser, test_list):
+def TestBrowser(session_builder, browser, test_list, verbose):
   """Runs Selenium tests for a specific browser.
 
   Args:
     session_builder: session_builder for creating new selenium sessions.
     browser: selenium browser name (eg. *iexplore, *firefox).
     test_list: list of tests.
     
   Returns:
     summary_result: result of test runners.
   """
   print "Testing %s..." % browser
   
-  summary_result = test_runner.TestResult(test_runner.StringBuffer(), browser)
+  summary_result = test_runner.TestResult(test_runner.StringBuffer(), browser,
+                                          verbose)
   
   # Fill up the selenium test queue.
   test_queue = Queue.Queue()
   for test in test_list:
     test_queue.put(test)
 
 
   pdiff_queue = None
   if FLAGS.screenshots:
     # Need to do screen comparisons.
     # |pdiff_queue| is the queue of perceptual diff tests that need to be done.
     # This queue is added to by individual slenium test runners.
     # |pdiff_result_queue| is the result of the perceptual diff tests.
     pdiff_queue = Queue.Queue()
     pdiff_result_queue = Queue.Queue()
     pdiff_worker = test_runner.PDiffTestRunner(pdiff_queue,
                                                pdiff_result_queue,
-                                               browser)
+                                               browser, verbose)
     pdiff_worker.start()
     
   # Start initial selenium test runner.
   worker = test_runner.SeleniumTestRunner(session_builder, browser,
-                                          test_queue, pdiff_queue)
+                                          test_queue, pdiff_queue,
+                                          verbose)
   worker.start()
 
   # Run through all selenium tests.
   while not worker.IsCompletelyDone():
     if worker.IsTesting() and worker.IsPastDeadline():
       # Test has taken more than allotted. Abort and go to next test.
       worker.AbortTest()
 
     elif worker.DidFinishTest():
       # Do this so that a worker does not grab test off queue till we tell it.     
       result = worker.Continue()
       result.printAll(sys.stdout)
       summary_result.merge(result)
+    
+    # Sleep here for a brief time.  This thread is polling the worker thread.
+    # We cannot wait for a message from the worker thread because the worker
+    # may hang on a bad test. We also do not want to sleep till the test's
+    # deadline because the test may finish before then.
+    time.sleep(.1)
 
   if FLAGS.screenshots:
     # Finish screenshot comparisons.
     pdiff_worker.EndTesting()
     while not pdiff_worker.IsCompletelyDone():
       time.sleep(1)
 
     # Be careful here, make sure no one else is editing |pdiff_reult_queue|.
     while not pdiff_result_queue.empty():
       result = pdiff_result_queue.get()
@@ skipping 52 matching lines @@
     sample = sample.strip()
     if not sample or sample[0] == ";" or sample[0] == "#":
       continue
 
     arguments = sample.split()
     test_type = arguments[0].lower()
     test_path = arguments[1]
     options = arguments[2:]
 
     # TODO: Add filter based on test_type
+    test_skipped = False
     if test_path.startswith("Test"):
       name = test_path
     else:
       # Need to make a name.
       name = ("Test" + prefix + re.sub("\W", "_", test_path) +
               test_type.capitalize())
-
+      # Only test suffixes for generic tests. That is how it has always worked.
+      if test_suffixes and not MatchesSuffix(name, test_suffixes):
+        test_skipped = True
+    
+    if test_prefix_filter and not name.startswith(test_prefix_filter):
+      test_skipped = True
+      
     # Only execute this test if the current browser is not in the list
     # of skipped browsers.
-    test_skipped = False
     screenshot_count = 0
     for option in options:
       if option.startswith("except"):
         skipped_platforms = selenium_utilities.GetArgument(option)
         if not skipped_platforms is None:
           skipped_platforms = skipped_platforms.split(",")
           if browser in skipped_platforms:
             test_skipped = True
       elif option.startswith("screenshots"):
         screenshot_count += int(selenium_utilities.GetArgument(option))
       elif option.startswith("screenshot"):
         screenshot_count += 1
 
-    if (test_prefix_filter and not name.startswith(test_prefix_filter) or
-        test_suffixes and not MatchesSuffix(name, test_suffixes)):
-      test_skipped = True
-
     if not test_skipped:
       # Add a test method with this name if it doesn't exist.
       if not (hasattr(module, name) and callable(getattr(module, name))):
         setattr(module, name, module.GenericTest)
              
       new_test = module(name, browser, path_to_html, test_type, test_path,
                         options)
       
       if screenshot_count and FLAGS.screenshots:
         pdiff_name = name + 'Screenshots'
@@ skipping 101 matching lines @@
     http_server.http_port,
     FLAGS.browserpath)
 
   all_tests_passed = True
   # Test browsers.
   for browser in FLAGS.browser:
     if browser in set(selenium_constants.SELENIUM_BROWSER_SET):
       test_list = GetTestsForBrowser(browser, FLAGS.testprefix,
                                      FLAGS.testsuffixes)
 
-      result = TestBrowser(session_builder, browser, test_list)
+      result = TestBrowser(session_builder, browser, test_list, FLAGS.verbose)
 
       if not result.wasSuccessful():
         all_tests_passed = False
 
       # Log non-succesful tests, for convenience.
       print ""
       print "Failures for %s:" % browser
       print "[Selenium tests]"
       for entry in test_list:
         if type(entry) == tuple:
@@ skipping 57 matching lines @@
 
   # Setup the LD_LIBRARY_PATH on Linux.
   if sys.platform[:5] == "linux":
     if os.environ.get("LD_LIBRARY_PATH"):
       os.environ["LD_LIBRARY_PATH"] = os.pathsep.join(
         [os.environ["LD_LIBRARY_PATH"], os.path.normpath(FLAGS.product_dir)])
     else:
       os.environ["LD_LIBRARY_PATH"] = os.path.normpath(FLAGS.product_dir)
 
   sys.exit(main(remaining_argv))