Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/dns/dns_config_service_unittest.cc

Issue 10543168: [net/dns] Instrument DnsConfigService to measure performance and failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test expectations on win' Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/dns/dns_config_service.h ('K') | « net/dns/dns_config_service_posix_unittest.cc ('k') | net/dns/dns_config_service_win.h » ('j') | net/dns/dns_config_service_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/dns_config_service_unittest.cc
diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc
index 462eadbd5301724b0d6e06071eeb678ff103e488..25338090a3e588312be4fb622c358c1bc549da78 100644
--- a/net/dns/dns_config_service_unittest.cc
+++ b/net/dns/dns_config_service_unittest.cc
@@ -189,7 +189,7 @@ TEST_F(DnsConfigServiceTest, DifferentConfig) {
EXPECT_TRUE(last_config_.Equals(config3));
}
-#if defined(OS_POSIX) || defined(OS_WIN)
+#if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN)
// TODO(szym): This is really an integration test and can time out if HOSTS is
// huge. http://crbug.com/107810
TEST_F(DnsConfigServiceTest, FLAKY_GetSystemConfig) {
« net/dns/dns_config_service.h ('K') | « net/dns/dns_config_service_posix_unittest.cc ('k') | net/dns/dns_config_service_win.h » ('j') | net/dns/dns_config_service_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698