From 480fdef415946f3a4a77d567f0fdb0716d70cc57 Mon Sep 17 00:00:00 2001 From: "kkania@google.com" Date: Thu, 24 Sep 2009 18:07:11 +0000 Subject: Changed selenium tests to recover from test crashes/hangs. Divided perceptual diff tests into unit test cases, which can be run alongside the selenium tests. Review URL: http://codereview.chromium.org/212031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27092 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/tests/selenium/javascript_unit_tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'o3d/tests/selenium/javascript_unit_tests.py') diff --git a/o3d/tests/selenium/javascript_unit_tests.py b/o3d/tests/selenium/javascript_unit_tests.py index 5b59f19..b714298 100644 --- a/o3d/tests/selenium/javascript_unit_tests.py +++ b/o3d/tests/selenium/javascript_unit_tests.py @@ -49,10 +49,10 @@ 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): @@ -275,7 +275,7 @@ class JavaScriptUnitTests(selenium_utilities.SeleniumTestCase): 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()") -- cgit v1.1