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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 217053005: s/FLAKY_/DISABLED_ for KioskTest.LaunchAppWithNetworkConfigAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "apps/app_window.h" 5 #include "apps/app_window.h"
6 #include "apps/app_window_registry.h" 6 #include "apps/app_window_registry.h"
7 #include "apps/ui/native_app_window.h" 7 #include "apps/ui/native_app_window.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/desktop_background/desktop_background_controller_observer.h" 9 #include "ash/desktop_background/desktop_background_controller_observer.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 RunAppLaunchNetworkDownTest(); 582 RunAppLaunchNetworkDownTest();
583 } 583 }
584 584
585 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDown) { 585 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDown) {
586 // Tests the network down case for launching an existing app that is 586 // Tests the network down case for launching an existing app that is
587 // installed in PRE_LaunchAppNetworkDown. 587 // installed in PRE_LaunchAppNetworkDown.
588 RunAppLaunchNetworkDownTest(); 588 RunAppLaunchNetworkDownTest();
589 } 589 }
590 590
591 // TODO(zelidrag): Figure out why this test is flaky on bbots. 591 // TODO(zelidrag): Figure out why this test is flaky on bbots.
592 IN_PROC_BROWSER_TEST_F(KioskTest, FLAKY_LaunchAppWithNetworkConfigAccelerator) { 592 IN_PROC_BROWSER_TEST_F(KioskTest,
593 DISABLED_LaunchAppWithNetworkConfigAccelerator) {
593 ScopedCanConfigureNetwork can_configure_network(true, false); 594 ScopedCanConfigureNetwork can_configure_network(true, false);
594 595
595 // Start app launch and wait for network connectivity timeout. 596 // Start app launch and wait for network connectivity timeout.
596 StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure()); 597 StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
597 OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH); 598 OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
598 splash_waiter.Wait(); 599 splash_waiter.Wait();
599 600
600 // A network error screen should be shown after authenticating. 601 // A network error screen should be shown after authenticating.
601 OobeScreenWaiter error_screen_waiter(OobeDisplay::SCREEN_ERROR_MESSAGE); 602 OobeScreenWaiter error_screen_waiter(OobeDisplay::SCREEN_ERROR_MESSAGE);
602 // Simulate Ctrl+Alt+N accelerator. 603 // Simulate Ctrl+Alt+N accelerator.
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 content::WindowedNotificationObserver( 1315 content::WindowedNotificationObserver(
1315 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 1316 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
1316 content::NotificationService::AllSources()).Wait(); 1317 content::NotificationService::AllSources()).Wait();
1317 1318
1318 // Wait for the wallpaper to load. 1319 // Wait for the wallpaper to load.
1319 WaitForWallpaper(); 1320 WaitForWallpaper();
1320 EXPECT_TRUE(wallpaper_loaded()); 1321 EXPECT_TRUE(wallpaper_loaded());
1321 } 1322 }
1322 1323
1323 } // namespace chromeos 1324 } // namespace chromeos
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