summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 18:06:09 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 18:06:09 +0000
commitcb84dc2b98f8132e71994f08e13d0e9c30ac1c1e (patch)
treeccce88c7965769acecd114d98cdeeb2a1f17c8c5
parenta223028a2c2d8113c9dbad9681e65268a8229b9a (diff)
downloadchromium_src-cb84dc2b98f8132e71994f08e13d0e9c30ac1c1e.zip
chromium_src-cb84dc2b98f8132e71994f08e13d0e9c30ac1c1e.tar.gz
chromium_src-cb84dc2b98f8132e71994f08e13d0e9c30ac1c1e.tar.bz2
FAILS tests should not turn the bot red.
Revert 50258 - TTF: Reenable some disabled tests. DevToolsSanityTest.TestConsoleLog seems to work ProxyResolverV8Test.FAILS_ReturnUnicode DepTest.FAILS_TestDepDisable VectorCanvasTest.FAILS_Matrix TEST=none BUG=disabled tests Review URL: http://codereview.chromium.org/2819011 TBR=vandebo@chromium.org Review URL: http://codereview.chromium.org/2862016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50261 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/browser/debugger/devtools_sanity_unittest.cc2
-rw-r--r--chrome/browser/sync/engine/syncer_unittest.cc1
-rw-r--r--net/proxy/proxy_resolver_v8_unittest.cc6
-rw-r--r--sandbox/src/dep_test.cc4
-rw-r--r--skia/ext/vector_canvas_unittest.cc2
5 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 66d62ca..5a40a93 100755
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -448,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleEval) {
}
// Tests console log.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleLog) {
RunTest("testConsoleLog", kConsoleTestPage);
}
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 9353978..f7946f5 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -2558,7 +2558,6 @@ TEST_F(SyncerTest, ServerDeletingFolderWeHaveMovedSomethingInto) {
// interesting case the 4th time SyncShare is called.
// TODO(chron): The fourth time that SyncShare is called it crashes.
// This seems to be due to a bug in the conflict set building logic.
-// http://crbug.com/46621
TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) {
ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
CHECK(dir.good());
diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc
index b6d8a47..ac5ab71 100644
--- a/net/proxy/proxy_resolver_v8_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_unittest.cc
@@ -306,9 +306,9 @@ TEST(ProxyResolverV8Test, UnhandledException) {
EXPECT_EQ(3, bindings->errors_line_number[0]);
}
-// TODO(eroman): This test fails right now, since the parsing of
-// host/port doesn't check for non-ascii characters. http://crbug.com/46608
-TEST(ProxyResolverV8Test, FAILS_ReturnUnicode) {
+// TODO(eroman): This test is disabed right now, since the parsing of
+// host/port doesn't check for non-ascii characters.
+TEST(ProxyResolverV8Test, DISABLED_ReturnUnicode) {
ProxyResolverV8WithMockBindings resolver;
int result = resolver.SetPacScriptFromDisk("return_unicode.js");
EXPECT_EQ(OK, result);
diff --git a/sandbox/src/dep_test.cc b/sandbox/src/dep_test.cc
index 62eeb1f..7d57c6e 100644
--- a/sandbox/src/dep_test.cc
+++ b/sandbox/src/dep_test.cc
@@ -166,8 +166,8 @@ SBOX_TESTS_COMMAND int CheckDepLevel(int argc, wchar_t **argv) {
} // namespace
-// This test fails. See bug 1275842
-TEST_F(DepTest, FAILS_TestDepDisable) {
+// This test is disabled. See bug 1275842
+TEST_F(DepTest, DISABLED_TestDepDisable) {
TestRunner runner(JOB_UNPROTECTED, USER_INTERACTIVE, USER_INTERACTIVE);
runner.SetTimeout(INFINITE);
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 0cb556d..92b70a7 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -924,7 +924,7 @@ TEST_F(VectorCanvasTest, ClippingClean) {
}
}
-TEST_F(VectorCanvasTest, FAILS_Matrix) {
+TEST_F(VectorCanvasTest, DISABLED_Matrix) {
SkBitmap bitmap;
LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap,
true);