summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-02 16:01:29 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-02 16:01:29 +0000
commiteedbd608e12247e9d7c8448dd45a25ccf29a5199 (patch)
treeac387f03cf8a156db3065b93f84ca9233345ba1d /chrome
parent5a5a9a22f18e5989b129b0fda8b0db6985cb2d3d (diff)
downloadchromium_src-eedbd608e12247e9d7c8448dd45a25ccf29a5199.zip
chromium_src-eedbd608e12247e9d7c8448dd45a25ccf29a5199.tar.gz
chromium_src-eedbd608e12247e9d7c8448dd45a25ccf29a5199.tar.bz2
Mark AnimatableImageTest.BasicAnimation as disabled.
It's been flaky since at least r82247. Can't mark as flaky a crashing test. Also disable CancelAnimation since if BasicAnimation crashes, CancelAnimation will crash too. Mac specific. TBR=rsesek@chromium.org BUG=81219 TEST= Review URL: http://codereview.chromium.org/6905165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/cocoa/animatable_image_unittest.mm8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/animatable_image_unittest.mm b/chrome/browser/ui/cocoa/animatable_image_unittest.mm
index 112e8dd..4e528fd 100644
--- a/chrome/browser/ui/cocoa/animatable_image_unittest.mm
+++ b/chrome/browser/ui/cocoa/animatable_image_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -24,7 +24,8 @@ class AnimatableImageTest : public CocoaTest {
AnimatableImage* animation_;
};
-TEST_F(AnimatableImageTest, BasicAnimation) {
+// http://crbug.com/81219
+TEST_F(AnimatableImageTest, DISABLED_BasicAnimation) {
[animation_ setStartFrame:CGRectMake(0, 0, 10, 10)];
[animation_ setEndFrame:CGRectMake(500, 500, 100, 100)];
[animation_ setStartOpacity:0.1];
@@ -33,7 +34,8 @@ TEST_F(AnimatableImageTest, BasicAnimation) {
[animation_ startAnimation];
}
-TEST_F(AnimatableImageTest, CancelAnimation) {
+// http://crbug.com/81219
+TEST_F(AnimatableImageTest, DISABLED_CancelAnimation) {
[animation_ setStartFrame:CGRectMake(0, 0, 10, 10)];
[animation_ setEndFrame:CGRectMake(500, 500, 100, 100)];
[animation_ setStartOpacity:0.1];