Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Side by Side Diff: athena/content/app_activity_unittest.cc

Issue 603473002: Disabled flaky athena test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /// Copyright 2014 The Chromium Authors. All rights reserved. 1 /// Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/public/activity_factory.h" 5 #include "athena/activity/public/activity_factory.h"
6 #include "athena/activity/public/activity_manager.h" 6 #include "athena/activity/public/activity_manager.h"
7 #include "athena/content/app_activity.h" 7 #include "athena/content/app_activity.h"
8 #include "athena/content/app_activity_registry.h" 8 #include "athena/content/app_activity_registry.h"
9 #include "athena/content/public/app_registry.h" 9 #include "athena/content/public/app_registry.h"
10 #include "athena/extensions/public/extensions_delegate.h" 10 #include "athena/extensions/public/extensions_delegate.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 EXPECT_EQ(0, GetActivityPosition(app_activity1a)); 336 EXPECT_EQ(0, GetActivityPosition(app_activity1a));
337 EXPECT_EQ(0, test_extensions_delegate()->restart_called()); 337 EXPECT_EQ(0, test_extensions_delegate()->restart_called());
338 338
339 DeleteActivity(activity_proxy); 339 DeleteActivity(activity_proxy);
340 DeleteActivity(app_activity1b); 340 DeleteActivity(app_activity1b);
341 DeleteActivity(app_activity1a); 341 DeleteActivity(app_activity1a);
342 } 342 }
343 343
344 // Test that an unload with multiple activities of the same app will only unload 344 // Test that an unload with multiple activities of the same app will only unload
345 // when all activities were marked for unloading. 345 // when all activities were marked for unloading.
346 TEST_F(AppActivityTest, TestMultipleActivityUnloadLock) { 346 // Flaky: http://crbug.com/417189.
347 TEST_F(AppActivityTest, DISABLED_TestMultipleActivityUnloadLock) {
347 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); 348 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
348 349
349 TestAppActivity* app_activity1 = CreateAppActivity(kDummyApp1); 350 TestAppActivity* app_activity1 = CreateAppActivity(kDummyApp1);
350 TestAppActivity* app_activity2 = CreateAppActivity(kDummyApp1); 351 TestAppActivity* app_activity2 = CreateAppActivity(kDummyApp1);
351 TestAppActivity* app_activity3 = CreateAppActivity(kDummyApp1); 352 TestAppActivity* app_activity3 = CreateAppActivity(kDummyApp1);
352 353
353 // Check that we have 3 activities of the same application. 354 // Check that we have 3 activities of the same application.
354 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications()); 355 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
355 AppActivityRegistry* app_activity_registry = 356 AppActivityRegistry* app_activity_registry =
356 app_activity1->app_activity_registry(); 357 app_activity1->app_activity_registry();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // However - the restart in this test framework does not really restart and 420 // However - the restart in this test framework does not really restart and
420 // all objects should be still there.. 421 // all objects should be still there..
421 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications()); 422 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
422 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy()); 423 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
423 Activity::Delete(app_activity_registry->unloaded_activity_proxy()); 424 Activity::Delete(app_activity_registry->unloaded_activity_proxy());
424 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); 425 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
425 } 426 }
426 427
427 } // namespace test 428 } // namespace test
428 } // namespace athena 429 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698