diff options
| -rwxr-xr-x | chrome/browser/debugger/devtools_sanity_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncer_unittest.cc | 1 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_v8_unittest.cc | 6 | ||||
| -rw-r--r-- | sandbox/src/dep_test.cc | 4 | ||||
| -rw-r--r-- | skia/ext/vector_canvas_unittest.cc | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 5a40a93..66d62ca 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, DISABLED_TestConsoleLog) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) { RunTest("testConsoleLog", kConsoleTestPage); } diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index f7946f5..9353978 100644 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -2558,6 +2558,7 @@ 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 ac5ab71..b6d8a47 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 is disabed right now, since the parsing of -// host/port doesn't check for non-ascii characters. -TEST(ProxyResolverV8Test, DISABLED_ReturnUnicode) { +// 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) { 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 7d57c6e..62eeb1f 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 is disabled. See bug 1275842 -TEST_F(DepTest, DISABLED_TestDepDisable) { +// This test fails. See bug 1275842 +TEST_F(DepTest, FAILS_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 92b70a7..0cb556d 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, DISABLED_Matrix) { +TEST_F(VectorCanvasTest, FAILS_Matrix) { SkBitmap bitmap; LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap, true); |