summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 00:24:50 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 00:24:50 +0000
commit19063d3d42bedf9be6197ec575ece628129afc64 (patch)
treea2cf84e2cc5f111a323cbc5e4da7677503344665 /chrome/test
parentf9d7b8ec335d082b0bc6c3dc680850b316dff160 (diff)
downloadchromium_src-19063d3d42bedf9be6197ec575ece628129afc64.zip
chromium_src-19063d3d42bedf9be6197ec575ece628129afc64.tar.gz
chromium_src-19063d3d42bedf9be6197ec575ece628129afc64.tar.bz2
Disabling the EmbeddedMP3 plugin test as it needs a functional sound device on the machine
to succeed. Disabling the MediaPlayerNew test as an ASSERT in Webkit is firing causing the renderer to crash. Will debug this more and log a bug. TBR=nsylvain Review URL: http://codereview.chromium.org/100236 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/plugin/plugin_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 0b8cc9a..d8461fd 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -138,7 +138,7 @@ TEST_F(PluginTest, Quicktime) {
TestPlugin(L"quicktime.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, MediaPlayerNew) {
+TEST_F(PluginTest, DISABLED_MediaPlayerNew) {
TestPlugin(L"wmp_new.html", kShortWaitTimeout);
}
@@ -225,7 +225,7 @@ TEST_F(ActiveXTest, DISABLED_CustomScripting) {
TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true);
}
-TEST_F(ActiveXTest, EmbeddedMP3) {
+TEST_F(ActiveXTest, DISABLED_EmbeddedMP3) {
TestActiveX(L"mp3_test.html", kLongWaitTimeout, false);
}