Commit 27d74a9f authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Commit Bot

Disabling ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_*.

Disabling for debug builds.

Bug: 1021191

TBR=rsorokin@chromium.org

Change-Id: Iee02d25f1b3ca6fb2564d4093c0c8023d3913e78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897486Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712214}
parent 56f7333a
...@@ -550,12 +550,20 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest, StoragePartitionUpdated) { ...@@ -550,12 +550,20 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest, StoragePartitionUpdated) {
test::OobeJS().CreateWaiter(partition_valid_and_changed_condition)->Wait(); test::OobeJS().CreateWaiter(partition_valid_and_changed_condition)->Wait();
} }
// Flaky in debug builds - crbug.com/1021191
#if defined(DEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_Success \
DISABLED_TestActiveDirectoryEnrollment_Success
#else
#define MAYBE_TestActiveDirectoryEnrollment_Success \
TestActiveDirectoryEnrollment_Success
#endif
// Shows the enrollment screen and mocks the enrollment helper to show Active // Shows the enrollment screen and mocks the enrollment helper to show Active
// Directory domain join screen. Verifies the domain join screen is displayed. // Directory domain join screen. Verifies the domain join screen is displayed.
// Submits Active Directory credentials. Verifies that the AuthpolicyClient // Submits Active Directory credentials. Verifies that the AuthpolicyClient
// calls us back with the correct realm. // calls us back with the correct realm.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
TestActiveDirectoryEnrollment_Success) { MAYBE_TestActiveDirectoryEnrollment_Success) {
ShowEnrollmentScreen(); ShowEnrollmentScreen();
enrollment_helper_.DisableAttributePromptUpdate(); enrollment_helper_.DisableAttributePromptUpdate();
enrollment_helper_.SetupActiveDirectoryJoin( enrollment_helper_.SetupActiveDirectoryJoin(
...@@ -581,10 +589,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, ...@@ -581,10 +589,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess); enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
} }
// Flaky in debug builds - crbug.com/1021191
#if defined(DEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_DistinguishedName \
DISABLED_TestActiveDirectoryEnrollment_DistinguishedName
#else
#define MAYBE_TestActiveDirectoryEnrollment_DistinguishedName \
TestActiveDirectoryEnrollment_DistinguishedName
#endif
// Verifies that the distinguished name specified on the Active Directory join // Verifies that the distinguished name specified on the Active Directory join
// domain screen correctly parsed and passed into AuthPolicyClient. // domain screen correctly parsed and passed into AuthPolicyClient.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
TestActiveDirectoryEnrollment_DistinguishedName) { MAYBE_TestActiveDirectoryEnrollment_DistinguishedName) {
ShowEnrollmentScreen(); ShowEnrollmentScreen();
enrollment_helper_.DisableAttributePromptUpdate(); enrollment_helper_.DisableAttributePromptUpdate();
enrollment_helper_.SetupActiveDirectoryJoin( enrollment_helper_.SetupActiveDirectoryJoin(
...@@ -614,12 +630,20 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, ...@@ -614,12 +630,20 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess); enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
} }
// Flaky in debug builds - crbug.com/1021191
#if defined(DEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_UIErrors \
DISABLED_TestActiveDirectoryEnrollment_UIErrors
#else
#define MAYBE_TestActiveDirectoryEnrollment_UIErrors \
TestActiveDirectoryEnrollment_UIErrors
#endif
// Shows the enrollment screen and mocks the enrollment helper to show Active // Shows the enrollment screen and mocks the enrollment helper to show Active
// Directory domain join screen. Verifies the domain join screen is displayed. // Directory domain join screen. Verifies the domain join screen is displayed.
// Submits Active Directory different incorrect credentials. Verifies that the // Submits Active Directory different incorrect credentials. Verifies that the
// correct error is displayed. // correct error is displayed.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
TestActiveDirectoryEnrollment_UIErrors) { MAYBE_TestActiveDirectoryEnrollment_UIErrors) {
ShowEnrollmentScreen(); ShowEnrollmentScreen();
enrollment_helper_.SetupActiveDirectoryJoin( enrollment_helper_.SetupActiveDirectoryJoin(
enrollment_screen(), kAdUserDomain, std::string(), kDMToken); enrollment_screen(), kAdUserDomain, std::string(), kDMToken);
...@@ -661,10 +685,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, ...@@ -661,10 +685,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
ExpectElementValid(kAdPasswordInput, true); ExpectElementValid(kAdPasswordInput, true);
} }
// Flaky in debug builds - crbug.com/1021191
#if defined(DEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_ErrorCard \
DISABLED_TestActiveDirectoryEnrollment_ErrorCard
#else
#define MAYBE_TestActiveDirectoryEnrollment_ErrorCard \
TestActiveDirectoryEnrollment_ErrorCard
#endif
// Check that correct error card is shown (Active Directory one). Also checks // Check that correct error card is shown (Active Directory one). Also checks
// that hitting retry shows Active Directory screen again. // that hitting retry shows Active Directory screen again.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
TestActiveDirectoryEnrollment_ErrorCard) { MAYBE_TestActiveDirectoryEnrollment_ErrorCard) {
ShowEnrollmentScreen(); ShowEnrollmentScreen();
enrollment_helper_.SetupActiveDirectoryJoin( enrollment_helper_.SetupActiveDirectoryJoin(
enrollment_screen(), kAdUserDomain, std::string(), kDMToken); enrollment_screen(), kAdUserDomain, std::string(), kDMToken);
...@@ -683,10 +715,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, ...@@ -683,10 +715,18 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepADJoin); enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepADJoin);
} }
// Flaky in debug builds - crbug.com/1021191
#if defined(DEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_Streamline \
DISABLED_TestActiveDirectoryEnrollment_Streamline
#else
#define MAYBE_TestActiveDirectoryEnrollment_Streamline \
TestActiveDirectoryEnrollment_Streamline
#endif
// Check that configuration for the streamline Active Directory domain join // Check that configuration for the streamline Active Directory domain join
// propagates correctly to the Domain Join UI. // propagates correctly to the Domain Join UI.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest, IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
TestActiveDirectoryEnrollment_Streamline) { MAYBE_TestActiveDirectoryEnrollment_Streamline) {
ShowEnrollmentScreen(); ShowEnrollmentScreen();
std::string binary_config; std::string binary_config;
EXPECT_TRUE(base::Base64Decode(kAdDomainJoinEncryptedConfig, &binary_config)); EXPECT_TRUE(base::Base64Decode(kAdDomainJoinEncryptedConfig, &binary_config));
......
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