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

tests/selenium/samples_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 41 matching lines @@
 import gflags
 import selenium_utilities
 
 
 class SampleTests(selenium_utilities.SeleniumTestCase):
   """Tests a couple of samples in the o3d samples directory."""
 
   # TODO: Change to correct object class when NPAPI class is exposed.
   SELENIUM_OBJ_TYPE = "[object HTMLObjectElement]"
 
-  def __init__(self, name, session, browser, path_to_html, test_type=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_finished
     which is set to true when it is finished initializing and is in a state
     ready for a screenshot.
     """
     self.RunGenericTest(
@@ skipping 231 matching lines @@
     # Figure out how many options there are.
     num_shaders = s.get_eval(
         "window.document.getElementById('shaderSelect').length")
 
     # try each shader
     for shader in range(0, int(num_shaders)):
       # select shader
       s.select("//select[@id='shaderSelect']", ("index=%d" % shader))
       # Take screenshot
       self.assertTrue(selenium_utilities.TakeScreenShot(
-          s, self.browser, "g_client", ("shader-test%d" % shader)))
+          s, self.browser, "g_client", "shader-test%d" % (shader + 1)))
 
   def TestSampleErrorTextureSmall(self):
     """Tests error-texture.html."""
 
     # Alias for the selenium session
     s = self.session
     s.open(self.GetURL("/samples/error-texture.html"))
 
     # Allow a limited time for the plugin to initialize.
     s.wait_for_condition("typeof(window.g_client) != 'undefined';", 30000)
@@ skipping 193 matching lines @@
     s.wait_for_condition("typeof(window.g_client) != 'undefined';", 10000)
 
     # Instruct the page to download the tgz file once.
     s.click("startLoad")
 
     s.wait_for_condition("(typeof(window.g_finished) != 'undefined') && "
                          "window.g_finished == true;", 20000)
 
 if __name__ == "__main__":
   pass