diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 23:54:26 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 23:54:26 +0000 |
| commit | 4d245165098d64e0a592daf8b0665ed58b4b7b69 (patch) | |
| tree | 29f0301348594372a106279f18dacdc42ebf95cc /chrome/browser/browser_encoding_uitest.cc | |
| parent | a9a5fa93c3778eda06937fdb80767bde1169782a (diff) | |
| download | chromium_src-4d245165098d64e0a592daf8b0665ed58b4b7b69.zip chromium_src-4d245165098d64e0a592daf8b0665ed58b4b7b69.tar.gz chromium_src-4d245165098d64e0a592daf8b0665ed58b4b7b69.tar.bz2 | |
Flakiness cleanup: disable flaky tests under chrome/browser/
Part 1 of N.
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6
BUG=104132,52928,100062,89762,82616,44668,44666,62537,69034,62538,81451,67301,62539,81451,69475,106538,84427,114104,103539,100538,109669,74557,96725,52544,68287,86105,89727,96725,95274,80961,83876
Review URL: http://codereview.chromium.org/9361066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index fd9e362..2be24e6 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <string> @@ -53,8 +53,9 @@ class BrowserEncodingTest : public UITest { // encoding name). Webkit layout tests cover some, but testing in the UI test is // also necessary. +// http://crbug.com/82616 #if defined(OS_MACOSX) -#define TestEncodingAliasMapping FLAKY_TestEncodingAliasMapping +#define TestEncodingAliasMapping DISABLED_TestEncodingAliasMapping #endif TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) { struct EncodingTestData { @@ -115,7 +116,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) { } // Marked as flaky: see http://crbug.com/44668 -TEST_F(BrowserEncodingTest, FLAKY_TestOverrideEncoding) { +TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) { const char* const kTestFileName = "gb18030_with_iso88591_meta.html"; const char* const kExpectedFileName = "expected_gb18030_saved_from_iso88591_meta.html"; @@ -178,7 +179,7 @@ TEST_F(BrowserEncodingTest, FLAKY_TestOverrideEncoding) { #if defined(OS_CHROMEOS) #define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect #else -#define MAYBE_TestEncodingAutoDetect FLAKY_TestEncodingAutoDetect +#define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect #endif TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) { |