summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 00:07:11 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 00:07:11 +0000
commit5e7f161f73f1817b8a0c422c0e4b5eceae6954e7 (patch)
treec04f4da6a278475a2372b4b92b420bd1d2de3070 /chrome
parent1b5044d5109fdcb5b96c737ff0a5144a8cb3fda5 (diff)
downloadchromium_src-5e7f161f73f1817b8a0c422c0e4b5eceae6954e7.zip
chromium_src-5e7f161f73f1817b8a0c422c0e4b5eceae6954e7.tar.gz
chromium_src-5e7f161f73f1817b8a0c422c0e4b5eceae6954e7.tar.bz2
Disabling tests that are failing.
BUG=7983 Review URL: http://codereview.appspot.com/21058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/plugin/plugin_test.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 0faaf8e..00f2123 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -131,11 +131,13 @@ class PluginTest : public UITest {
}
};
-TEST_F(PluginTest, Quicktime) {
+// Disabling all tests to make buildbot green. See -
+// http://code.google.com/p/chromium/issues/detail?id=7983
+TEST_F(PluginTest, DISABLED_Quicktime) {
TestPlugin(L"quicktime.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, MediaPlayerNew) {
+TEST_F(PluginTest, DISABLED_MediaPlayerNew) {
TestPlugin(L"wmp_new.html", kShortWaitTimeout);
}
@@ -144,27 +146,27 @@ TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
TestPlugin(L"wmp_old.html", kLongWaitTimeout);
}
-TEST_F(PluginTest, Real) {
+TEST_F(PluginTest, DISABLED_Real) {
TestPlugin(L"real.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, Flash) {
+TEST_F(PluginTest, DISABLED_Flash) {
TestPlugin(L"flash.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, FlashOctetStream) {
+TEST_F(PluginTest, DISABLED_FlashOctetStream) {
TestPlugin(L"flash-octet-stream.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, FlashSecurity) {
+TEST_F(PluginTest, DISABLED_FlashSecurity) {
TestPlugin(L"flash.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, Java) {
+TEST_F(PluginTest, DISABLED_Java) {
TestPlugin(L"Java.html", kShortWaitTimeout);
}
-TEST_F(PluginTest, Silverlight) {
+TEST_F(PluginTest, DISABLED_Silverlight) {
TestPlugin(L"silverlight.html", kShortWaitTimeout);
}
@@ -209,15 +211,15 @@ class ActiveXTest : public PluginTest {
bool dll_registered;
};
-TEST_F(ActiveXTest, EmbeddedWMP) {
+TEST_F(ActiveXTest, DISABLED_EmbeddedWMP) {
TestActiveX(L"activex_embedded_wmp.html", kLongWaitTimeout, false);
}
-TEST_F(ActiveXTest, WMP) {
+TEST_F(ActiveXTest, DISABLED_WMP) {
TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false);
}
-TEST_F(ActiveXTest, CustomScripting) {
+TEST_F(ActiveXTest, DISABLED_CustomScripting) {
TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true);
}