Commit 0b40b2e8 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

Revert "Re-enable some oobe configuration tests"

This reverts commit 12e1e936.

Reason for revert: Still flaky. https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/42775

Original change's description:
> 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/+/2529353
> Reviewed-by: Renato Silva <rrsilva@google.com>
> Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#826244}

TBR=antrim@chromium.org,rrsilva@google.com

Change-Id: I242fe22b863af581e4b35d0cc1b92e2aaaf7ff68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532575Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826261}
parent 6cfdceed
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
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
...@@ -229,7 +233,8 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModePreferences) { ...@@ -229,7 +233,8 @@ 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, TestDemoModeOfflineNetwork) { IN_PROC_BROWSER_TEST_F(OobeConfigurationTest,
MAYBE_TestDemoModeOfflineNetwork) {
LoadConfiguration(); LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait(); OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment(); SimulateOfflineEnvironment();
...@@ -238,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeOfflineNetwork) { ...@@ -238,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeOfflineNetwork) {
// 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, TestDemoModeAcceptEula) { IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_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