summaryrefslogtreecommitdiffstats
path: root/athena
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 12:43:54 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 12:43:54 +0000
commit248ee9be3db637800a1bf7b13817df43f904248b (patch)
tree9399fc629309ed95dc25e92e04063956aec295a7 /athena
parentbacf713afaacf8088dc09870a10612659ab76f81 (diff)
downloadchromium_src-248ee9be3db637800a1bf7b13817df43f904248b.zip
chromium_src-248ee9be3db637800a1bf7b13817df43f904248b.tar.gz
chromium_src-248ee9be3db637800a1bf7b13817df43f904248b.tar.bz2
Disable athena_unittests failing memory bot.
R=pneubeck@chromium.org TBR=jamescook BUG=399241 Review URL: https://codereview.chromium.org/433863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
-rw-r--r--athena/activity/activity_manager_unittest.cc3
-rw-r--r--athena/home/home_card_unittest.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc
index f94b6e8..4d5eb1d 100644
--- a/athena/activity/activity_manager_unittest.cc
+++ b/athena/activity/activity_manager_unittest.cc
@@ -9,7 +9,8 @@
typedef athena::test::AthenaTestBase ActivityManagerTest;
-TEST_F(ActivityManagerTest, Basic) {
+// TODO(flackr): Fix memory leak and re-enable - http://crbug.com/399241
+TEST_F(ActivityManagerTest, DISABLED_Basic) {
athena::ActivityManager::Get()->AddActivity(
athena::ActivityFactory::Get()->CreateWebActivity(NULL, GURL()));
}
diff --git a/athena/home/home_card_unittest.cc b/athena/home/home_card_unittest.cc
index 31d0de1..0657f87 100644
--- a/athena/home/home_card_unittest.cc
+++ b/athena/home/home_card_unittest.cc
@@ -47,7 +47,8 @@ TEST_F(HomeCardTest, VirtualKeyboardTransition) {
}
// Verify if the home card is correctly minimized after app launch.
-TEST_F(HomeCardTest, AppSelection) {
+// TODO(flackr): Fix memory leak and re-enable - http://crbug.com/399241
+TEST_F(HomeCardTest, DISABLED_AppSelection) {
EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
WindowManager::GetInstance()->ToggleOverview();