summaryrefslogtreecommitdiffstats
path: root/o3d/tests/selenium/sample_list.txt
diff options
context:
space:
mode:
authorkkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 18:07:11 +0000
committerkkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 18:07:11 +0000
commit480fdef415946f3a4a77d567f0fdb0716d70cc57 (patch)
tree15d2efc158c13e9ecb0e722d69b5a53c4f30d4f6 /o3d/tests/selenium/sample_list.txt
parentdf6d7777e48c1136c745e40e745fe5e5f3513ff4 (diff)
downloadchromium_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/sample_list.txt')
-rw-r--r--o3d/tests/selenium/sample_list.txt19
1 files changed, 11 insertions, 8 deletions
diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt
index 9b35450..90c3c62 100644
--- a/o3d/tests/selenium/sample_list.txt
+++ b/o3d/tests/selenium/sample_list.txt
@@ -72,9 +72,9 @@
# http://wiki.corp.google.com/twiki/bin/view/Main/ClientThreeDSampleGuidelines
#
#
-medium 2d screenshot pdiff_threshold(200) pdiff_threshold_mac(41200) colorfactor(0.8) downsample(1)
+medium 2d screenshot timeout(30000) pdiff_threshold(200) pdiff_threshold_mac(41200) colorfactor(0.8) downsample(1)
medium animation
-large animated-scene screenshot timeout(45000) pdiff_threshold(200)
+large animated-scene screenshot timeout(55000) pdiff_threshold(200)
large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(200) pdiff_threshold_mac(2100) downsample(1) except(*iexplore, *googlechrome)
medium billboards screenshot pdiff_threshold(200)
medium bitmap-draw-image screenshot pdiff_threshold(200)
@@ -124,16 +124,19 @@ large GoogleIO-2009/step14ex screenshot pdiff_threshold(200) timeou
# function to custom run the test. As such, only the 'except' and
# pdiff_threshold options have any meaning
-small TestSampleErrorTextureSmall pdiff_threshold(200)
-small TestSampleHelloCube_TexturesSmall pdiff_threshold(450)
+small TestSampleErrorTextureSmall pdiff_threshold(200) screenshots(5)
+small TestSampleHelloCube_TexturesSmall pdiff_threshold(450) screenshot
small TestSampleRefreshPageLoad_Small
-medium TestSampleCustomCamera pdiff_threshold(200) pdiff_threshold_win(200)
+medium TestSampleCustomCamera pdiff_threshold(200) pdiff_threshold_win(200) screenshot
medium TestSamplePicking
medium TestSampleRenderMode
-medium TestSampleRotateModel pdiff_threshold(200)
-medium TestSampleShader_Test pdiff_threshold(200) pdiff_threshold_win(200)
+medium TestSampleRotateModel pdiff_threshold(200) screenshot
+medium TestSampleShader_Test pdiff_threshold(200) pdiff_threshold_win(200) screenshots(13)
large TestSampleMultipleClientsLarge
large TestSamplePingPongLarge
# This test currently fails on IE as it considers localhost: to be a trusted
# domain.
-small TestLoadTextureFromFileSmall except(*iexplore)
+# Do not run this test until get rid of scons. It assumes a particular
+# directory structure to find an asset. Need to change to reflect new gyp
+# directory structure. Should be changed when scons is gone.
+#small TestLoadTextureFromFileSmall except(*iexplore)