summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 11:39:42 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 11:39:42 +0000
commit0446dc76b0c00527f43b718ca99768032c78ea14 (patch)
tree23891db3ec2494a09acccbfe5071034a19f0e310 /ash
parent7fe8fd8c2ceff4e7b5d79dd82e367a53c695cd75 (diff)
downloadchromium_src-0446dc76b0c00527f43b718ca99768032c78ea14.zip
chromium_src-0446dc76b0c00527f43b718ca99768032c78ea14.tar.gz
chromium_src-0446dc76b0c00527f43b718ca99768032c78ea14.tar.bz2
Disable the following tests because of use-after-free errors reported by AddressSanitizer:
ShelfLayoutManagerTest.OpenAppListWithShelfVisibleState ShelfLayoutManagerTest.OpenAppListWithShelfAutoHideState ShelfLayoutManagerTest.OpenAppListWithShelfHiddenState SystemTrayTest.SystemTrayNotifications AcceleratorControllerTest.GlobalAccelerators BUG=127538,127539 TBR=jennyz,ben Review URL: https://chromiumcodereview.appspot.com/10332090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_controller_unittest.cc3
-rw-r--r--ash/system/tray/system_tray_unittest.cc3
-rw-r--r--ash/wm/shelf_layout_manager_unittest.cc9
3 files changed, 10 insertions, 5 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 4ea3ff7..80e9a4b 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -405,7 +405,8 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
}
#endif
-TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
+// Disabled due to a real bug, see http://crbug.com/127538.
+TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) {
// CycleBackward
EXPECT_TRUE(GetController()->Process(
ui::Accelerator(ui::VKEY_F5, true, false, false)));
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 6a25f0e..0946fbd 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -125,7 +125,8 @@ TEST_F(SystemTrayTest, SystemTrayTestItems) {
ASSERT_TRUE(detailed_item->detailed_view() == NULL);
}
-TEST_F(SystemTrayTest, SystemTrayNotifications) {
+// Disabled due to a use-after-free, see http://crbug.com/127539.
+TEST_F(SystemTrayTest, DISABLED_SystemTrayNotifications) {
scoped_ptr<SystemTray> tray(CreateSystemTray());
ASSERT_TRUE(tray->widget());
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 3f64f94..a0d0a76 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -392,7 +392,8 @@ TEST_F(ShelfLayoutManagerTest, VisibleWhenStatusOrLauncherFocused) {
// Makes sure shelf will be visible when app list opens as shelf is in VISIBLE
// state,and toggling app list won't change shelf visibility state.
-TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfVisibleState) {
+// Disabled due to a real bug, see http://crbug.com/127538.
+TEST_F(ShelfLayoutManagerTest, DISABLED_OpenAppListWithShelfVisibleState) {
Shell* shell = Shell::GetInstance();
ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
shelf->LayoutShelf();
@@ -419,7 +420,8 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfVisibleState) {
// Makes sure shelf will be shown with AUTO_HIDE_SHOWN state when app list opens
// as shelf is in AUTO_HIDE state, and toggling app list won't change shelf
// visibility state.
-TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) {
+// Disabled due to a real bug, see http://crbug.com/127538.
+TEST_F(ShelfLayoutManagerTest, DISABLED_OpenAppListWithShelfAutoHideState) {
Shell* shell = Shell::GetInstance();
ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
shelf->LayoutShelf();
@@ -452,7 +454,8 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) {
// Makes sure shelf will be hidden when app list opens as shelf is in HIDDEN
// state, and toggling app list won't change shelf visibility state.
-TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfHiddenState) {
+// Disabled due to a real bug, see http://crbug.com/127538.
+TEST_F(ShelfLayoutManagerTest, DISABLED_OpenAppListWithShelfHiddenState) {
Shell* shell = Shell::GetInstance();
ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
// For shelf to be visible, app list is not open in initial state.