summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-23 23:15:30 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-23 23:15:30 +0000
commit69dd6fe9c07993bfacd34a01dbb77c3807cedd44 (patch)
treebe6ff33f89e86ae06e5484fb4747c173173d252c
parent6eb4c2d1ff321424f88b2e191a29826584790985 (diff)
downloadchromium_src-69dd6fe9c07993bfacd34a01dbb77c3807cedd44.zip
chromium_src-69dd6fe9c07993bfacd34a01dbb77c3807cedd44.tar.gz
chromium_src-69dd6fe9c07993bfacd34a01dbb77c3807cedd44.tar.bz2
Disable 3 tests potentially because of run_test_cases;
ChromeOS / unit_tests: KioskModeIdleLogoutTest.CheckObserversBeforeUserLogin KioskModeIdleLogoutTest.CheckObserversAfterUserLogin BUG=177918 TBR=rkc@chromium.org Windows / net_unittests: URLRequestTestHTTP.GetTest_ManyCookies BUG=177916 TBR=droger@chromium.org Review URL: https://codereview.chromium.org/12310088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184328 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc6
-rw-r--r--net/url_request/url_request_unittest.cc8
2 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
index f0c8fc6..f9d7845 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc
@@ -63,12 +63,14 @@ class KioskModeIdleLogoutTest : public ash::test::AshTestBase {
content::NotificationRegistrar registrar_;
};
-TEST_F(KioskModeIdleLogoutTest, CheckObserversBeforeUserLogin) {
+// http://crbug.com/177918
+TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversBeforeUserLogin) {
EXPECT_TRUE(LoginUserObserverRegistered());
EXPECT_FALSE(PowerManagerObserverRegistered());
}
-TEST_F(KioskModeIdleLogoutTest, CheckObserversAfterUserLogin) {
+// http://crbug.com/177918
+TEST_F(KioskModeIdleLogoutTest, DISABLED_CheckObserversAfterUserLogin) {
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_LOGIN_USER_CHANGED,
content::Source<UserManager>(UserManager::Get()),
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index eec3aa5..28df2a1 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2809,7 +2809,13 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) {
// search is used to estimate that maximum number of cookies that are accepted
// by the browser. Beyond the maximum number, the request will fail with
// ERR_RESPONSE_HEADERS_TOO_BIG.
-TEST_F(URLRequestTestHTTP, GetTest_ManyCookies) {
+#if defined(OS_WIN)
+// http://crbug.com/177916
+#define MAYBE_GetTest_ManyCookies DISABLED_GetTest_ManyCookies
+#else
+#define MAYBE_GetTest_ManyCookies GetTest_ManyCookies
+#endif // defined(OS_WIN)
+TEST_F(URLRequestTestHTTP, MAYBE_GetTest_ManyCookies) {
ASSERT_TRUE(test_server_.Start());
int lower_bound = 0;