diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 14:05:31 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 14:05:31 +0000 |
| commit | db3631154c638fb342efc535f924630a60811431 (patch) | |
| tree | a21ebc2a271baa23ff69d1f7b4d6ab2d241121b4 | |
| parent | 4a0c7b4034465d51fc86c29b3a400fda8415e758 (diff) | |
| download | chromium_src-db3631154c638fb342efc535f924630a60811431.zip chromium_src-db3631154c638fb342efc535f924630a60811431.tar.gz chromium_src-db3631154c638fb342efc535f924630a60811431.tar.bz2 | |
[Spellcheck] Disabling SpellcheckHostMetricsTest.CustomWordStats / SpellcheckCustomDictionaryTest.RecordSizeStatsCorrectly on Windows versions vista and higher due to consistent failures.
BUG=230534
TBR=dominicc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23007020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218476 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc index 9bd334e..72c73d6 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc @@ -25,6 +25,11 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +// For version specific disabled tests below (http://crbug.com/230534). +#include "base/win/windows_version.h" +#endif + using base::HistogramBase; using base::HistogramSamples; using base::StatisticsRecorder; @@ -1068,9 +1073,12 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) { server_custom_dictionary->GetWords().size()); } -// Failing consistently on Win7. See crbug.com/230534. -// Re-enabling for testing to fix aforementioned bug. TEST_F(SpellcheckCustomDictionaryTest, RecordSizeStatsCorrectly) { +#if defined(OS_WIN) +// Failing consistently on Win7. See crbug.com/230534. + if (base::win::GetVersion() >= base::win::VERSION_VISTA) + return; +#endif // Record a baseline. SpellCheckHostMetrics::RecordCustomWordCountStats(123); diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc index 0d0f29a..37df690 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc @@ -13,6 +13,11 @@ #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +// For version specific disabled tests below (http://crbug.com/230534). +#include "base/win/windows_version.h" +#endif + using base::HistogramBase; using base::HistogramSamples; using base::StatisticsRecorder; @@ -66,9 +71,12 @@ TEST_F(SpellcheckHostMetricsTest, RecordEnabledStats) { EXPECT_EQ(1, samples->GetCount(1)); } -// Failing consistently on Win7. See crbug.com/230534. -// Re-enabling for testing to fix aforementioned bug. TEST_F(SpellcheckHostMetricsTest, CustomWordStats) { +#if defined(OS_WIN) +// Failing consistently on Win7. See crbug.com/230534. + if (base::win::GetVersion() >= base::win::VERSION_VISTA) + return; +#endif SpellCheckHostMetrics::RecordCustomWordCountStats(123); // Determine if test failures are due the statistics recorder not being |