Fix minor issues for some tests, and disable others.

Review URL: http://codereview.chromium.org/660152

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40309 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 8 deletions

diff --git a/o3d/samples/shadow-map.html b/o3d/samples/shadow-map.html
index 0035de6..5b9b442 100644
--- a/o3d/samples/shadow-map.html
+++ b/o3d/samples/shadow-map.html
@@ -366,7 +366,7 @@ function createLightShape() {
 
   // Scale and translate a cube of side length 2 to get a box
   // that extends from [-1, -1, 0] to [1, 1, 1].
-  var shape = o3djs.debug.createLineCube(
+  var shape = o3djs.lineprimitives.createLineCube(
                   g_pack,
                   o3djs.material.createConstantMaterial(g_pack,
                                                         g_colorViewInfo,
diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt
index a133157..5679f3f 100644
--- a/o3d/tests/selenium/javascript_unit_test_list.txt
+++ b/o3d/tests/selenium/javascript_unit_test_list.txt
@@ -68,14 +68,15 @@ small   serialization-test
 small   math-test
 small   features-test
 small   quaternion-test
-# TODO Temporarily removing until V8 bug is fixed
 small   v8-test
 small   init-status-test
 small   quaternion-test
 small   base-test
 small   util-test
 small   pixel-perfection      screenshot pdiff_threshold(200) pdiff_threshold_mac(3000) except(*iexplore)
-medium  offscreen-test
+# Firefox opens an error dialog on this test stating that O3D failed to
+# start (issue #212). Chrome fails this test occasionally (issue #105).
+medium  offscreen-test        except(*firefox, *googlechrome)
 medium  texture-set-test      screenshot
 medium  param-array-test      screenshot
 small   render-target-clear-test screenshot
diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt
index 9073445..828ee6d 100644
--- a/o3d/tests/selenium/sample_list.txt
+++ b/o3d/tests/selenium/sample_list.txt
@@ -31,9 +31,12 @@
 #       that setting g_clock to the same value will always produce the same
 #       image.
 #
-#   timeout(milliseconds) : Set the timeout to wait for readiness.
+#   timeout(milliseconds) : Set the timeout to wait for the initial page load.
 #       Default 10000.
 #
+#   run_timeout(milliseconds) : Set the timeout for the test, not including
+#       the initial page load. Default is 25000 plus time for each screenshot.
+#
 #   client(client_variable_name) : Name of client variable in javascript.
 #       Default = "g_client"
 #
@@ -126,13 +129,15 @@ large   GoogleIO-2009/step14ex            screenshot pdiff_threshold(200) timeou
 
 small   TestSampleErrorTextureSmall       pdiff_threshold(200) screenshots(5)
 small   TestSampleHelloCube_TexturesSmall pdiff_threshold(450) screenshot
-small   TestSampleRefreshPageLoad_Small
+# IE and chrome hang on this test.
+small   TestSampleRefreshPageLoad_Small   except(*iexplore, *googlechrome)
 medium  TestSampleCustomCamera            pdiff_threshold(200) pdiff_threshold_win(200) screenshot run_time(180000)
 medium  TestSamplePicking                 run_time(60000)
 medium  TestSampleRenderMode              run_time(60000)
 medium  TestSampleRotateModel             pdiff_threshold(200) screenshots(2) run_time(100000)
 medium  TestSampleShader_Test             pdiff_threshold(200) pdiff_threshold_win(200) screenshots(13)
-large   TestSampleMultipleClientsLarge    run_time(180000)
+# IE takes several minutes just loading this test.
+large   TestSampleMultipleClientsLarge    run_time(180000) except(*iexplore)
 large   TestSamplePingPongLarge
 # This test currently fails on IE as it considers localhost: to be a trusted
 # domain.
diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html
index 0c2dafe..9d9a151 100644
--- a/o3d/tests/selenium/tests/v8-test.html
+++ b/o3d/tests/selenium/tests/v8-test.html
@@ -515,7 +515,8 @@ g_suite.testV8ExceptionsInFunctionCallResultInErrorCallback = function() {
   if (!isChrome && !isSafari) {
     g_test.assertTrue(exceptionThrown);
   }
-  g_test.assertEquals('Uncaught error in function() { throw "error"; }', error);
+  g_test.assertEquals('Uncaught error in (function() { throw "error"; })',
+                      error);
 };
 
 g_suite.testV8ExceptionsInMethodCallResultInErrorCallback = function() {
@@ -611,7 +612,8 @@ g_suite.testExceptionThrownIfV8CodeIsInvalid = function() {
   } catch (e) {
     exceptionThrown = true;
   }
-  g_test.assertEquals('Uncaught SyntaxError: Unexpected token ) in +1)', error);
+  g_test.assertEquals('Uncaught SyntaxError: Unexpected token ) in (+1))',
+                      error);
   if (!isSafari && !isChrome) {
     g_test.assertTrue(exceptionThrown);
   }