diff options
| author | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 18:07:11 +0000 |
|---|---|---|
| committer | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 18:07:11 +0000 |
| commit | 480fdef415946f3a4a77d567f0fdb0716d70cc57 (patch) | |
| tree | 15d2efc158c13e9ecb0e722d69b5a53c4f30d4f6 /o3d/tests/selenium/javascript_unit_tests.py | |
| parent | df6d7777e48c1136c745e40e745fe5e5f3513ff4 (diff) | |
| download | chromium_src-480fdef415946f3a4a77d567f0fdb0716d70cc57.zip chromium_src-480fdef415946f3a4a77d567f0fdb0716d70cc57.tar.gz chromium_src-480fdef415946f3a4a77d567f0fdb0716d70cc57.tar.bz2 | |
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
Diffstat (limited to 'o3d/tests/selenium/javascript_unit_tests.py')
| -rw-r--r-- | o3d/tests/selenium/javascript_unit_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
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()") |