Commit 12e1e936 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Re-enable some oobe configuration tests

Tests are not flaky (tested with setting affinity + running stress
in parallel).

Fixed: 997685
Change-Id: I565c0753a5e2841794b8873de4e22b19dfd79f05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529353Reviewed-by: default avatarRenato Silva <rrsilva@google.com>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826244}
parent 234748bd
...@@ -46,10 +46,6 @@ ...@@ -46,10 +46,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
...@@ -233,8 +229,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModePreferences) { ...@@ -233,8 +229,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();
...@@ -243,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, ...@@ -243,7 +238,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