Changed selenium tests to recover from test crashes/hangs. Divided perceptual...

tests/selenium/javascript_unit_tests.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 31 matching lines @@
 named customcamera1_reference.png requires that there be a corresponding
 screenshot.
 """
 
 
 import selenium_utilities
 
 class JavaScriptUnitTests(selenium_utilities.SeleniumTestCase):
   """Runs the JavaScript unit tests for the sample utilities."""
 
-  def __init__(self, name, session, browser, path_to_html, test_type=None,
-               sample_path=None,  options=None):
+  def __init__(self, name, browser, path_to_html, test_type=None,
+               sample_path=None, options=None):
     selenium_utilities.SeleniumTestCase.__init__(
-        self, name, session, browser, path_to_html, test_type, sample_path,
+        self, name, browser, path_to_html, test_type, sample_path,
         options)
 
   def GenericTest(self):
     """Generically test a sample.
 
     Each sample is expected to have a global variable called g_testResult
     That starts undefined and is set to true or false when the test is finished.
     """
     self.RunGenericTest(
         "/tests/selenium/tests/",
@@ skipping 202 matching lines @@
                               [1793, 2933, 2914, 2, 2746, 182, 2564],
                               [1793, 2825, 2848, 2, 2604, 171, 2433],
                               [1793, 2933, 2790, 2, 2870, 155, 2715],
                               [1793, 4337, 3004, 2, 5360, 237, 5123]]
 
     # Take screenshots
     for clock in range(0, 8):
       s.run_script("window.g_clock = " + str(clock * 3.14159 * 2.5 + 0.5))
       self.assertTrue(
           selenium_utilities.TakeScreenShot(s, self.browser, "window.g_client",
-                                            "cullingzsort" + str(clock)))
+                                            "cullingzsort" + str(clock + 1)))
       s.run_script("g_framesRendered = 0")
       while int(s.get_eval("window.g_framesRendered")) < 3:
         s.run_script("window.g_client.render()")
       data = [s.get_eval("window.g_totalTransformsElement.innerHTML"),
               s.get_eval("window.g_transformsProcessedElement.innerHTML"),
               s.get_eval("window.g_transformsCulledElement.innerHTML"),
               s.get_eval("window.g_totalDrawElementsElement.innerHTML"),
               s.get_eval("window.g_drawElementsProcessedElement.innerHTML"),
               s.get_eval("window.g_drawElementsCulledElement.innerHTML"),
               s.get_eval("window.g_drawElementsRenderedElement.innerHTML")]
       new_data.append(data)
       print ", ".join(data)
 
     # check the results
     for clock in range(0, 8):
       for ii in range(0, 7):
         # comment out the following line and add a "pass" line if you need new
         # culling reference data.
         self.assertEqual(int(new_data[clock][ii]),
                          culling_reference_data[clock][ii])
 
 
 if __name__ == "__main__":
   pass