Commit bdaa15f2 authored by kustermann's avatar kustermann Committed by Commit bot

Disable flaky tests: AutoEnrollmentClientTest and CacheNotStarted

BUG=422884
TBR=mnissler@google.com

Review URL: https://codereview.chromium.org/652673003

Cr-Commit-Position: refs/heads/master@{#299283}
parent 06968cb7
...@@ -178,10 +178,17 @@ void DeviceLocalAccountExternalPolicyLoaderTest::SetForceInstallListPolicy() { ...@@ -178,10 +178,17 @@ void DeviceLocalAccountExternalPolicyLoaderTest::SetForceInstallListPolicy() {
store_.NotifyStoreLoaded(); store_.NotifyStoreLoaded();
} }
#if defined(OS_CHROMEOS)
// crbug.com/422884
#define MAYBE_CacheNotStarted DISABLED_CacheNotStarted
#else
#define MAYBE_CacheNotStarted CacheNotStarted
#endif
// Verifies that when the cache is not explicitly started, the loader does not // Verifies that when the cache is not explicitly started, the loader does not
// serve any extensions, even if the force-install list policy is set or a load // serve any extensions, even if the force-install list policy is set or a load
// is manually requested. // is manually requested.
TEST_F(DeviceLocalAccountExternalPolicyLoaderTest, CacheNotStarted) { TEST_F(DeviceLocalAccountExternalPolicyLoaderTest, MAYBE_CacheNotStarted) {
// Set the force-install list policy. // Set the force-install list policy.
SetForceInstallListPolicy(); SetForceInstallListPolicy();
......
...@@ -394,7 +394,14 @@ TEST_F(AutoEnrollmentClientTest, NetworkChangeRetryAfterErrors) { ...@@ -394,7 +394,14 @@ TEST_F(AutoEnrollmentClientTest, NetworkChangeRetryAfterErrors) {
EXPECT_TRUE(HasCachedDecision()); EXPECT_TRUE(HasCachedDecision());
} }
TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonWithPendingRequest) { #if defined(OS_CHROMEOS)
// crbug.com/422884
#define MAYBE_CancelAndDeleteSoonWithPendingRequest DISABLED_CancelAndDeleteSoonWithPendingRequest
#else
#define MAYBE_CancelAndDeleteSoonWithPendingRequest CancelAndDeleteSoonWithPendingRequest
#endif
TEST_F(AutoEnrollmentClientTest, MAYBE_CancelAndDeleteSoonWithPendingRequest) {
MockDeviceManagementJob* job = NULL; MockDeviceManagementJob* job = NULL;
ServerWillReplyAsync(&job); ServerWillReplyAsync(&job);
EXPECT_FALSE(job); EXPECT_FALSE(job);
...@@ -415,7 +422,14 @@ TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonWithPendingRequest) { ...@@ -415,7 +422,14 @@ TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonWithPendingRequest) {
EXPECT_EQ(AUTO_ENROLLMENT_STATE_PENDING, state_); EXPECT_EQ(AUTO_ENROLLMENT_STATE_PENDING, state_);
} }
TEST_F(AutoEnrollmentClientTest, NetworkChangedAfterCancelAndDeleteSoon) { #if defined(OS_CHROMEOS)
// crbug.com/422884
#define MAYBE_NetworkChangedAfterCancelAndDeleteSoon DISABLED_NetworkChangedAfterCancelAndDeleteSoon
#else
#define MAYBE_NetworkChangedAfterCancelAndDeleteSoon
#endif
TEST_F(AutoEnrollmentClientTest, MAYBE_NetworkChangedAfterCancelAndDeleteSoon) {
MockDeviceManagementJob* job = NULL; MockDeviceManagementJob* job = NULL;
ServerWillReplyAsync(&job); ServerWillReplyAsync(&job);
EXPECT_FALSE(job); EXPECT_FALSE(job);
...@@ -445,7 +459,14 @@ TEST_F(AutoEnrollmentClientTest, NetworkChangedAfterCancelAndDeleteSoon) { ...@@ -445,7 +459,14 @@ TEST_F(AutoEnrollmentClientTest, NetworkChangedAfterCancelAndDeleteSoon) {
EXPECT_EQ(AUTO_ENROLLMENT_STATE_PENDING, state_); EXPECT_EQ(AUTO_ENROLLMENT_STATE_PENDING, state_);
} }
TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonAfterCompletion) { #if defined(OS_CHROMEOS)
// crbug.com/422884
#define MAYBE_CancelAndDeleteSoonAfterCompletion DISABLED_CancelAndDeleteSoonAfterCompletion
#else
#define MAYBE_CancelAndDeleteSoonAfterCompletion CancelAndDeleteSoonAfterCompletion
#endif
TEST_F(AutoEnrollmentClientTest, MAYBE_CancelAndDeleteSoonAfterCompletion) {
ServerWillReply(-1, true, true); ServerWillReply(-1, true, true);
ServerWillSendState( ServerWillSendState(
"example.com", "example.com",
...@@ -460,7 +481,14 @@ TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonAfterCompletion) { ...@@ -460,7 +481,14 @@ TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonAfterCompletion) {
EXPECT_TRUE(base::MessageLoop::current()->IsIdleForTesting()); EXPECT_TRUE(base::MessageLoop::current()->IsIdleForTesting());
} }
TEST_F(AutoEnrollmentClientTest, CancelAndDeleteSoonAfterNetworkFailure) { #if defined(OS_CHROMEOS)
// crbug.com/422884
#define MAYBE_CancelAndDeleteSoonAfterNetworkFailure DISABLED_CancelAndDeleteSoonAfterNetworkFailure
#else
#define MAYBE_CancelAndDeleteSoonAfterNetworkFailure CancelAndDeleteSoonAfterNetworkFailure
#endif
TEST_F(AutoEnrollmentClientTest, MAYBE_CancelAndDeleteSoonAfterNetworkFailure) {
ServerWillFail(DM_STATUS_TEMPORARY_UNAVAILABLE); ServerWillFail(DM_STATUS_TEMPORARY_UNAVAILABLE);
client_->Start(); client_->Start();
EXPECT_EQ(AUTO_ENROLLMENT_STATE_SERVER_ERROR, state_); EXPECT_EQ(AUTO_ENROLLMENT_STATE_SERVER_ERROR, state_);
......
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