Commit 92c9e3b1 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

OOBE: Restore disabled OobeConfigurationTest tests

Seems that changes made in recent month made testing code more
stable, so tests are not flaky anymore.

TEST=run tests with --gtest_repeat=25 --gtest_break_on_failure with
     affinity to 2 codes + simulated CPU load on same cores

Bug: 997685
Change-Id: I687e0191bddfe569d5a9fcdf60761c66024e7476
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339989
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795872}
parent e908633d
...@@ -44,10 +44,6 @@ ...@@ -44,10 +44,6 @@
using testing::_; using testing::_;
using testing::Invoke; using testing::Invoke;
// Disabled due to flakiness: https://crbug.com/997685.
#define MAYBE_TestDemoModeOfflineNetwork DISABLED_TestDemoModeOfflineNetwork
#define MAYBE_TestDemoModeAcceptEula DISABLED_TestDemoModeAcceptEula
namespace chromeos { namespace chromeos {
// This test case will use // This test case will use
...@@ -231,8 +227,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModePreferences) { ...@@ -231,8 +227,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModePreferences) {
// Check that configuration lets correctly use offline demo mode on network // Check that configuration lets correctly use offline demo mode on network
// screen. // screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeOfflineNetwork) {
MAYBE_TestDemoModeOfflineNetwork) {
LoadConfiguration(); LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait(); OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment(); SimulateOfflineEnvironment();
...@@ -241,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, ...@@ -241,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest,
// Check that configuration lets correctly use offline demo mode on EULA // Check that configuration lets correctly use offline demo mode on EULA
// screen. // screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModeAcceptEula) { IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeAcceptEula) {
LoadConfiguration(); LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait(); OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment(); SimulateOfflineEnvironment();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment