diff options
| author | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:43:56 +0000 |
|---|---|---|
| committer | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:43:56 +0000 |
| commit | e28cb73fd4bc94221e823d2adf0bb49ce96203c4 (patch) | |
| tree | 6420a8a541b86c1d8ea8225a7f61dddb83b65669 /o3d | |
| parent | 13326bbed15f36965826368a0079742e7ba530ce (diff) | |
| download | chromium_src-e28cb73fd4bc94221e823d2adf0bb49ce96203c4.zip chromium_src-e28cb73fd4bc94221e823d2adf0bb49ce96203c4.tar.gz chromium_src-e28cb73fd4bc94221e823d2adf0bb49ce96203c4.tar.bz2 | |
Fixes perceptual diff pixel comparison bug and CustomCamera test.
Review URL: http://codereview.chromium.org/270098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/selenium/pdiff_test.py | 2 | ||||
| -rw-r--r-- | o3d/tests/selenium/samples_tests.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/o3d/tests/selenium/pdiff_test.py b/o3d/tests/selenium/pdiff_test.py index 0f8b58c..d1d4940 100644 --- a/o3d/tests/selenium/pdiff_test.py +++ b/o3d/tests/selenium/pdiff_test.py @@ -125,7 +125,7 @@ class PDiffTest(unittest.TestCase): all_tests_passed = True
msg = "Pixel threshold is %s. Failing screenshots:\n" % pixel_threshold
for name, pixels in results:
- if pixels >= pixel_threshold:
+ if pixels >= int(pixel_threshold):
all_tests_passed = False
msg += " %s, differing by %s\n" % (name, str(pixels))
diff --git a/o3d/tests/selenium/samples_tests.py b/o3d/tests/selenium/samples_tests.py index 70ccad5..7e993b1 100644 --- a/o3d/tests/selenium/samples_tests.py +++ b/o3d/tests/selenium/samples_tests.py @@ -181,10 +181,11 @@ class SampleTests(selenium_utilities.SeleniumTestCase): self.assertEqual("Tutorial B4: Cameras and events", s.get_title()) self.assertEqual("null", s.get_eval("window.undefined_symbol_xxxyyy")) - # Try different views of the camera - # Set delay between each operation at 10ms. + # Try different views of the camera. + # Set delay between each operation at 100ms. This is needed for some + # versions of IE and Chrome. speed = int(s.get_speed()) - s.set_speed(10) + s.set_speed(100) s.type("eyeX", "5") s.type("eyeY", "5") s.type("eyeZ", "5") |