summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 06:47:12 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 06:47:12 +0000
commit7266c5c9e76a485c98c56c507173e528fd677c3e (patch)
treeffddbeb6bcb47511b3b8d6865f10c935fcb55a23
parent2dc0ec1d4c3c6edaac3b0c8af462ef60f721eb6b (diff)
downloadchromium_src-7266c5c9e76a485c98c56c507173e528fd677c3e.zip
chromium_src-7266c5c9e76a485c98c56c507173e528fd677c3e.tar.gz
chromium_src-7266c5c9e76a485c98c56c507173e528fd677c3e.tar.bz2
Mark ScreenLockerTest.TestEscape/TestShowTwice flaky
BUG=78764 TEST=none Review URL: http://codereview.chromium.org/6811032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80898 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/screen_locker_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index 8558534..7da5a55 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -274,7 +274,8 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestNoPasswordWithKeyPress) {
TestNoPassword(KeyPress);
}
-IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
+// See http://crbug.com/78764.
+IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestShowTwice) {
EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
.Times(2)
.RetiresOnSaturation();
@@ -294,7 +295,8 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestShowTwice) {
EXPECT_FALSE(tester->IsLocked());
}
-IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestEscape) {
+// See http://crbug.com/78764.
+IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestEscape) {
EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
.Times(1)
.RetiresOnSaturation();