Chromium Code Reviews| Index: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc |
| diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc |
| index 1d47496e39f71f3492b309c57c096b4eadd2173b..b04094d67b32f84b55e56affa60222bc04199690 100644 |
| --- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc |
| +++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc |
| @@ -168,11 +168,11 @@ class HandsOffNetworkScreenTest : public NetworkScreenTest { |
| DISALLOW_COPY_AND_ASSIGN(HandsOffNetworkScreenTest); |
| }; |
| -#if defined(OS_CHROMEOS) |
| -#define MAYBE_RequiresNoInput DISABLED_RequiresNoInput |
| -#else |
| +//#if defined(OS_CHROMEOS) |
| +//#define MAYBE_RequiresNoInput DISABLED_RequiresNoInput |
| +//#else |
| #define MAYBE_RequiresNoInput RequiresNoInput |
| -#endif |
| +//#endif |
|
xiyuan
2016/11/28 23:38:40
Remove all these and MAYBE_RequiresNoInput -> Requ
kumarniranjan
2016/11/29 23:36:47
Done.
|
| IN_PROC_BROWSER_TEST_F(HandsOffNetworkScreenTest, MAYBE_RequiresNoInput) { |
| WizardController* wizard_controller = WizardController::default_controller(); |
| @@ -182,6 +182,7 @@ IN_PROC_BROWSER_TEST_F(HandsOffNetworkScreenTest, MAYBE_RequiresNoInput) { |
| // Simulate a network connection. |
| EXPECT_CALL(*mock_network_state_helper_, IsConnected()) |
| + .Times(AnyNumber()) |
| .WillRepeatedly((Return(true))); |
| network_screen_->UpdateStatus(); |
| @@ -192,8 +193,9 @@ IN_PROC_BROWSER_TEST_F(HandsOffNetworkScreenTest, MAYBE_RequiresNoInput) { |
| ASSERT_TRUE((!network_screen_->is_network_subscribed_) && |
| network_screen_->network_state_helper_->IsConnected()); |
| - // Check that we reach the enrollment screen. |
| - OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENROLLMENT).Wait(); |
| + // Wait for the enrollment screen. |
| + OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENROLLMENT) |
| + .WaitNoAssertCurrentScreen(); |
|
xiyuan
2016/11/28 23:38:40
Line 185 probably fix the issue. We should not get
kumarniranjan
2016/11/29 23:36:47
Putting the assert back causes the test to fail wi
xiyuan
2016/11/29 23:50:06
0x0B is SCREEN_ERROR_MESSAGE, aka the network erro
|
| // Check that attestation-based enrollment finishes |
| // with either success or error. |